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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1865133002: kiosk: Fix kiosk session restart (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restore "PublicAccounts" local state Created 4 years, 8 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
« chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc ('K') | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc ('k') | chrome/browser/extensions/api/file_system/file_system_api_unittest.cc » ('j') | chrome/browser/extensions/api/file_system/file_system_api_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/users/mock_user_manager.h
diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h
index 8791db30f7b4d4d384247ce3d8599171f8a922fc..dc8a15be1f57471a1ecf6c73d4648275068bc461 100644
--- a/chrome/browser/chromeos/login/users/mock_user_manager.h
+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h
@@ -97,7 +97,7 @@ class MockUserManager : public ChromeUserManager {
void(const AccountId&,
user_manager::User::OAuthTokenStatus status));
MOCK_CONST_METHOD0(IsEnterpriseManaged, bool(void));
- MOCK_METHOD1(LoadPublicAccounts, void(std::set<AccountId>*));
+ MOCK_METHOD1(LoadDeviceLocalAccounts, void(std::set<AccountId>*));
MOCK_METHOD0(PerformPreUserListLoadingActions, void(void));
MOCK_METHOD0(PerformPostUserListLoadingActions, void(void));
MOCK_METHOD1(PerformPostUserLoggedInActions, void(bool));
@@ -105,7 +105,7 @@ class MockUserManager : public ChromeUserManager {
MOCK_CONST_METHOD1(IsKioskApp, bool(const AccountId&));
MOCK_CONST_METHOD1(IsPublicAccountMarkedForRemoval, bool(const AccountId&));
MOCK_METHOD0(DemoAccountLoggedIn, void(void));
- MOCK_METHOD1(KioskAppLoggedIn, void(const AccountId&));
+ MOCK_METHOD1(KioskAppLoggedIn, void(user_manager::User*));
MOCK_METHOD1(PublicAccountUserLoggedIn, void(user_manager::User*));
MOCK_METHOD1(SupervisedUserLoggedIn, void(const AccountId&));
MOCK_METHOD1(OnUserRemoved, void(const AccountId&));
« chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc ('K') | « chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc ('k') | chrome/browser/extensions/api/file_system/file_system_api_unittest.cc » ('j') | chrome/browser/extensions/api/file_system/file_system_api_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698