diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 17:23:20 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-01 17:23:20 +0000 |
| commit | 3e7d50574325cd2a82c14a97ef8e97c7c8ec7ef4 (patch) | |
| tree | a5a07f3c8f725e359ed2a5e7ae25e9e5fb673f67 /ash/system | |
| parent | 7ed054dbdb861d45a06055483d18d739234efbb1 (diff) | |
| download | chromium_src-3e7d50574325cd2a82c14a97ef8e97c7c8ec7ef4.zip chromium_src-3e7d50574325cd2a82c14a97ef8e97c7c8ec7ef4.tar.gz chromium_src-3e7d50574325cd2a82c14a97ef8e97c7c8ec7ef4.tar.bz2 | |
Changed DisplayName std::string => string16, which is a prerequisite to display that name in the status tray.
BUG=119603,127190
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10441143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/tray/system_tray_delegate.h | 2 | ||||
| -rw-r--r-- | ash/system/user/tray_user.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index 3c6f3f8..a344495 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -104,7 +104,7 @@ class SystemTrayDelegate { virtual bool GetTrayVisibilityOnStartup() = 0; // Gets information about the logged in user. - virtual const std::string GetUserDisplayName() const = 0; + virtual const string16 GetUserDisplayName() const = 0; virtual const std::string GetUserEmail() const = 0; virtual const gfx::ImageSkia& GetUserImage() const = 0; virtual user::LoginStatus GetUserLoginStatus() const = 0; diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index d894335..4d3caaf 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -182,7 +182,7 @@ class UserView : public views::View, views::BoxLayout::kVertical, 0, 5, 0)); ash::SystemTrayDelegate* tray = ash::Shell::GetInstance()->tray_delegate(); - username_ = new views::Label(UTF8ToUTF16(tray->GetUserDisplayName())); + username_ = new views::Label(tray->GetUserDisplayName()); username_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); user->AddChildView(username_); |