| Index: chrome/browser/chromeos/login/user_manager_impl.h
|
| diff --git a/chrome/browser/chromeos/login/user_manager_impl.h b/chrome/browser/chromeos/login/user_manager_impl.h
|
| index 7b8b9a6c8f1adaca9526027ebee6e6d402bd7530..074e329cfcf5298f87832d2288d1d700ae346271 100644
|
| --- a/chrome/browser/chromeos/login/user_manager_impl.h
|
| +++ b/chrome/browser/chromeos/login/user_manager_impl.h
|
| @@ -85,8 +85,8 @@ class UserManagerImpl
|
| const std::string& user_id,
|
| User::OAuthTokenStatus oauth_token_status) OVERRIDE;
|
| virtual void SaveUserDisplayName(const std::string& user_id,
|
| - const string16& display_name) OVERRIDE;
|
| - virtual string16 GetUserDisplayName(
|
| + const base::string16& display_name) OVERRIDE;
|
| + virtual base::string16 GetUserDisplayName(
|
| const std::string& user_id) const OVERRIDE;
|
| virtual void SaveUserDisplayEmail(const std::string& user_id,
|
| const std::string& display_email) OVERRIDE;
|
|
|