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/shell.cc | |
| 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/shell.cc')
| -rw-r--r-- | ash/shell.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 84f1663..96d9476 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -65,6 +65,7 @@ #include "ash/wm/workspace_controller.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/utf_string_conversions.h" #include "grit/ui_resources.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/user_action_client.h" @@ -270,8 +271,8 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { virtual bool GetTrayVisibilityOnStartup() OVERRIDE { return true; } // Overridden from SystemTrayDelegate: - virtual const std::string GetUserDisplayName() const OVERRIDE { - return "Über tray Über tray Über tray Über tray"; + virtual const string16 GetUserDisplayName() const OVERRIDE { + return UTF8ToUTF16("Über tray Über tray Über tray Über tray"); } virtual const std::string GetUserEmail() const OVERRIDE { |