| Index: chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/login/supervised_user_manager_impl.h b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| similarity index 92%
|
| rename from chrome/browser/chromeos/login/supervised_user_manager_impl.h
|
| rename to chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| index a54b78c1eb217a13be02cd6bd47474a3cad2623e..db0c9757303476a6164327a56d6a4a8eb37e9220 100644
|
| --- a/chrome/browser/chromeos/login/supervised_user_manager_impl.h
|
| +++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.h
|
| @@ -2,15 +2,15 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_USER_MANAGER_IMPL_H_
|
| -#define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_USER_MANAGER_IMPL_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SUPERVISED_USER_MANAGER_IMPL_H_
|
| +#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SUPERVISED_USER_MANAGER_IMPL_H_
|
|
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
|
| -#include "chrome/browser/chromeos/login/supervised_user_manager.h"
|
| +#include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
|
|
|
| namespace chromeos {
|
|
|
| @@ -30,8 +30,8 @@ class SupervisedUserManagerImpl
|
| 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* FindByDisplayName(const base::string16& display_name)
|
| + const OVERRIDE;
|
| virtual const 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
|
| @@ -40,7 +40,8 @@ class SupervisedUserManagerImpl
|
| OVERRIDE;
|
| virtual std::string GetManagerDisplayEmail(const std::string& user_id) const
|
| OVERRIDE;
|
| - virtual void StartCreationTransaction(const base::string16& display_name) OVERRIDE;
|
| + virtual void StartCreationTransaction(const base::string16& display_name)
|
| + OVERRIDE;
|
| virtual void SetCreationTransactionUserId(const std::string& user_id)
|
| OVERRIDE;
|
| virtual void CommitCreationTransaction() OVERRIDE;
|
| @@ -116,4 +117,4 @@ class SupervisedUserManagerImpl
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_USER_MANAGER_IMPL_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_SUPERVISED_USER_MANAGER_IMPL_H_
|
|
|