Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1560)

Unified Diff: chrome/browser/chromeos/login/mock_user_manager.h

Issue 10459003: Load user custom wallpaper after browser crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix aura_shell_unittests Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/mock_user_manager.h b/chrome/browser/chromeos/login/mock_user_manager.h
index ee520c337deb7d8e522de861bb0dfbb79ced95ed..7540b82fe2f075cb881896ae136b2f6f4ab1032f 100644
--- a/chrome/browser/chromeos/login/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/mock_user_manager.h
@@ -24,6 +24,7 @@ class MockUserManager : public UserManager {
MOCK_METHOD0(DemoUserLoggedIn, void(void));
MOCK_METHOD0(GuestUserLoggedIn, void(void));
MOCK_METHOD1(EphemeralUserLoggedIn, void(const std::string&));
+ MOCK_METHOD0(SetLoggedInUserWallpaper, void(void));
MOCK_METHOD1(UserSelected, void(const std::string&));
MOCK_METHOD0(SessionStarted, void(void));
MOCK_METHOD2(RemoveUser, void(const std::string&, RemoveUserDelegate*));
@@ -76,11 +77,6 @@ class MockUserManager : public UserManager {
// Sets a new User instance.
void SetLoggedInUser(const std::string& email, bool guest);
- // Return an invalid user wallpaper index. No need to load a real wallpaper.
- // When loading wallpaper asynchronously, it may actually cause a crash if
- // test finished before wallpaper loaded.
- virtual int GetLoggedInUserWallpaperIndex() OVERRIDE;
-
User* user_;
};
« no previous file with comments | « chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc ('k') | chrome/browser/chromeos/login/mock_user_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698