Index: chrome/browser/chromeos/login/supervised_user_manager.h |
diff --git a/chrome/browser/chromeos/login/supervised_user_manager.h b/chrome/browser/chromeos/login/supervised_user_manager.h |
index 880c989c75bdf458d796a2f4d27e00cd2488f8fb..4b116a8118a98b9075856d6637a9af2032c39606 100644 |
--- a/chrome/browser/chromeos/login/supervised_user_manager.h |
+++ b/chrome/browser/chromeos/login/supervised_user_manager.h |
@@ -37,14 +37,15 @@ class SupervisedUserManager { |
const std::string& manager_id, |
const std::string& local_user_id, |
const std::string& sync_user_id, |
- const string16& display_name) = 0; |
+ const base::string16& display_name) = 0; |
// Generates unique user ID for supervised user. |
virtual std::string GenerateUserId() = 0; |
// Returns the supervised user with the given |display_name| if found in |
// the persistent list. Returns |NULL| otherwise. |
- virtual const User* FindByDisplayName(const string16& display_name) const = 0; |
+ virtual const User* FindByDisplayName( |
+ const base::string16& display_name) const = 0; |
// Returns the supervised user with the given |sync_id| if found in |
// the persistent list. Returns |NULL| otherwise. |
@@ -57,7 +58,8 @@ class SupervisedUserManager { |
// Returns the display name for manager of user |user_id| if it is known |
// (was previously set by a |SaveUserDisplayName| call). |
// Otherwise, returns a manager id. |
- virtual string16 GetManagerDisplayName(const std::string& user_id) const = 0; |
+ virtual base::string16 GetManagerDisplayName( |
+ const std::string& user_id) const = 0; |
// Returns the user id for manager of user |user_id| if it is known (user is |
// actually a managed user). |
@@ -71,7 +73,7 @@ class SupervisedUserManager { |
const = 0; |
// Create a record about starting supervised user creation transaction. |
- virtual void StartCreationTransaction(const string16& display_name) = 0; |
+ virtual void StartCreationTransaction(const base::string16& display_name) = 0; |
// Add user id to supervised user creation transaction record. |
virtual void SetCreationTransactionUserId(const std::string& user_id) = 0; |