| Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| index 74308174427999869f2bec0207744eaaa6b032fc..3daa00e42d7b726ce3425c07029781c1ddbe4aa0 100644
|
| --- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| +++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| @@ -24,15 +24,16 @@ class SupervisedUserManagerImpl
|
| virtual ~SupervisedUserManagerImpl();
|
|
|
| virtual bool HasSupervisedUsers(const std::string& manager_id) const OVERRIDE;
|
| - virtual const User* CreateUserRecord(
|
| + virtual const user_manager::User* CreateUserRecord(
|
| const std::string& manager_id,
|
| const std::string& local_user_id,
|
| const std::string& sync_user_id,
|
| const base::string16& display_name) OVERRIDE;
|
| virtual std::string GenerateUserId() OVERRIDE;
|
| - virtual const User* FindByDisplayName(const base::string16& display_name)
|
| - const OVERRIDE;
|
| - virtual const User* FindBySyncId(const std::string& sync_id) const OVERRIDE;
|
| + virtual const user_manager::User* FindByDisplayName(
|
| + const base::string16& display_name) const OVERRIDE;
|
| + virtual const user_manager::User* FindBySyncId(
|
| + const std::string& sync_id) const OVERRIDE;
|
| virtual std::string GetUserSyncId(const std::string& user_id) const OVERRIDE;
|
| virtual base::string16 GetManagerDisplayName(const std::string& user_id) const
|
| OVERRIDE;
|
|
|