| Index: chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h
|
| diff --git a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h
|
| index 4b870c25b2f778e30b5883ac75b734794b817235..a1cfe324134641903c360f4e5235d6e904984253 100644
|
| --- a/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h
|
| +++ b/chrome/browser/chromeos/login/managed/locally_managed_user_creation_screen.h
|
| @@ -68,7 +68,7 @@ class LocallyManagedUserCreationScreen
|
| virtual void OnActorDestroyed(LocallyManagedUserCreationScreenHandler* actor)
|
| OVERRIDE;
|
| virtual void CreateManagedUser(
|
| - const string16& display_name,
|
| + const base::string16& display_name,
|
| const std::string& managed_user_password) OVERRIDE;
|
| virtual void ImportManagedUser(const std::string& user_id) OVERRIDE;
|
| virtual void ImportManagedUserWithPassword(
|
| @@ -79,7 +79,7 @@ class LocallyManagedUserCreationScreen
|
| const std::string& manager_password) OVERRIDE;
|
| virtual void AbortFlow() OVERRIDE;
|
| virtual void FinishFlow() OVERRIDE;
|
| - virtual bool FindUserByDisplayName(const string16& display_name,
|
| + virtual bool FindUserByDisplayName(const base::string16& display_name,
|
| std::string *out_id) const OVERRIDE;
|
| virtual void OnPageSelected(const std::string& page) OVERRIDE;
|
|
|
|
|