| Index: chrome/browser/chromeos/login/user.cc
|
| diff --git a/chrome/browser/chromeos/login/user.cc b/chrome/browser/chromeos/login/user.cc
|
| index 33b38e27ecbf00d7dd6abbfbbb0e40e623fdae0f..b47d6505fcdd1e05aca91ebb72668b3515e65a20 100644
|
| --- a/chrome/browser/chromeos/login/user.cc
|
| +++ b/chrome/browser/chromeos/login/user.cc
|
| @@ -150,7 +150,7 @@ bool UserContext::operator==(const UserContext& context) const {
|
| context.using_oauth == using_oauth;
|
| }
|
|
|
| -string16 User::GetDisplayName() const {
|
| +base::string16 User::GetDisplayName() const {
|
| // Fallback to the email account name in case display name haven't been set.
|
| return display_name_.empty() ?
|
| UTF8ToUTF16(GetAccountName(true)) :
|
|
|