| Index: chrome/browser/chromeos/login/user_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
|
| index c06060e4df693794188f8f1df552661bcc2963b2..1af5a26f6fcf6d2f5e5aa864d36c67ff48d1fa96 100644
|
| --- a/chrome/browser/chromeos/login/user_manager.cc
|
| +++ b/chrome/browser/chromeos/login/user_manager.cc
|
| @@ -52,8 +52,8 @@ PendingUserSessionsRestoreFinished() {
|
| UserManager::UserSessionStateObserver::~UserSessionStateObserver() {
|
| }
|
|
|
| -UserManager::UserAccountData::UserAccountData(const string16& display_name,
|
| - const string16& given_name,
|
| +UserManager::UserAccountData::UserAccountData(const base::string16& display_name,
|
| + const base::string16& given_name,
|
| const std::string& locale)
|
| : display_name_(display_name),
|
| given_name_(given_name),
|
|
|