| Index: chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
|
| index 08f12bea0076d3fbfa22ecf8ba42fcbf51d9df02..0b27401cebbc44251a0704a8158600125b0dc697 100644
|
| --- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
|
| +++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
|
| @@ -154,7 +154,7 @@ class ChromeUserManagerImpl
|
| const AccountId& account_id,
|
| user_manager::User::OAuthTokenStatus status) const override;
|
| bool IsEnterpriseManaged() const override;
|
| - void LoadPublicAccounts(std::set<AccountId>* users_set) override;
|
| + void LoadDeviceLocalAccounts(std::set<AccountId>* users_set) override;
|
| void NotifyOnLogin() override;
|
| void NotifyUserAddedToSession(const user_manager::User* added_user,
|
| bool user_switch_pending) override;
|
| @@ -165,12 +165,11 @@ class ChromeUserManagerImpl
|
| void RemoveUserInternal(const AccountId& account_id,
|
| user_manager::RemoveUserDelegate* delegate) override;
|
| bool IsDemoApp(const AccountId& account_id) const override;
|
| - bool IsKioskApp(const AccountId& account_id) const override;
|
| bool IsPublicAccountMarkedForRemoval(
|
| const AccountId& account_id) const override;
|
| void DemoAccountLoggedIn() override;
|
| void GuestUserLoggedIn() override;
|
| - void KioskAppLoggedIn(const AccountId& kiosk_app_account_id) override;
|
| + void KioskAppLoggedIn(user_manager::User* user) override;
|
| void PublicAccountUserLoggedIn(user_manager::User* user) override;
|
| void RegularUserLoggedIn(const AccountId& account_id) override;
|
| void RegularUserLoggedInAsEphemeral(const AccountId& account_id) override;
|
|
|