diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 08:49:04 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 08:49:04 +0000 |
| commit | d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c (patch) | |
| tree | b3215901378d4ced136abc04494204095fe7714d /views/aura_desktop | |
| parent | 09e14d69cad45e0a11720793ad110545592f85ae (diff) | |
| download | chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.zip chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.gz chromium_src-d9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c.tar.bz2 | |
Revert 103095 - Change std::wstring to string16 on WidgetDelegate::GetWindowTitle.
BUG=68267
TEST=No visible changes
Review URL: http://codereview.chromium.org/7972009
TBR=yosin@chromium.org
Review URL: http://codereview.chromium.org/8052030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103096 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/aura_desktop')
| -rw-r--r-- | views/aura_desktop/aura_desktop_main.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc index 11b082f..d95acd7 100644 --- a/views/aura_desktop/aura_desktop_main.cc +++ b/views/aura_desktop/aura_desktop_main.cc @@ -7,7 +7,6 @@ #include "base/i18n/icu_util.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkXfermode.h" #include "ui/aura/desktop.h" #include "ui/aura/desktop_host.h" @@ -110,8 +109,8 @@ class TestWindowContents : public views::WidgetDelegateView { } // Overridden from views::WidgetDelegateView: - virtual string16 GetWindowTitle() const OVERRIDE { - return ASCIIToUTF16("Test Window!"); + virtual std::wstring GetWindowTitle() const OVERRIDE { + return L"Test Window!"; } virtual View* GetContentsView() OVERRIDE { return this; |