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 /ui/aura_shell | |
| 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 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/examples/toplevel_window.cc | 4 | ||||
| -rw-r--r-- | ui/aura_shell/examples/toplevel_window.h | 2 | ||||
| -rw-r--r-- | ui/aura_shell/examples/window_type_launcher.cc | 4 | ||||
| -rw-r--r-- | ui/aura_shell/examples/window_type_launcher.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ui/aura_shell/examples/toplevel_window.cc b/ui/aura_shell/examples/toplevel_window.cc index 242cc88..875a077 100644 --- a/ui/aura_shell/examples/toplevel_window.cc +++ b/ui/aura_shell/examples/toplevel_window.cc @@ -37,8 +37,8 @@ void ToplevelWindow::OnPaint(gfx::Canvas* canvas) { canvas->FillRectInt(SK_ColorDKGRAY, 0, 0, width(), height()); } -string16 ToplevelWindow::GetWindowTitle() const { - return ASCIIToUTF16("Examples: Toplevel Window"); +std::wstring ToplevelWindow::GetWindowTitle() const { + return L"Examples: Toplevel Window"; } views::View* ToplevelWindow::GetContentsView() { diff --git a/ui/aura_shell/examples/toplevel_window.h b/ui/aura_shell/examples/toplevel_window.h index 49757ce..8b61743 100644 --- a/ui/aura_shell/examples/toplevel_window.h +++ b/ui/aura_shell/examples/toplevel_window.h @@ -29,7 +29,7 @@ class ToplevelWindow : public views::WidgetDelegateView { virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; // Overridden from views::WidgetDelegate: - virtual string16 GetWindowTitle() const OVERRIDE; + virtual std::wstring GetWindowTitle() const OVERRIDE; virtual View* GetContentsView() OVERRIDE; virtual bool CanResize() const OVERRIDE; virtual bool CanMaximize() const OVERRIDE; diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc index b4a9681..e620088 100644 --- a/ui/aura_shell/examples/window_type_launcher.cc +++ b/ui/aura_shell/examples/window_type_launcher.cc @@ -86,8 +86,8 @@ bool WindowTypeLauncher::CanResize() const { return true; } -string16 WindowTypeLauncher::GetWindowTitle() const { - return ASCIIToUTF16("Examples: Window Builder"); +std::wstring WindowTypeLauncher::GetWindowTitle() const { + return L"Examples: Window Builder"; } views::NonClientFrameView* WindowTypeLauncher::CreateNonClientFrameView() { diff --git a/ui/aura_shell/examples/window_type_launcher.h b/ui/aura_shell/examples/window_type_launcher.h index 9fb6eaf..aab1126 100644 --- a/ui/aura_shell/examples/window_type_launcher.h +++ b/ui/aura_shell/examples/window_type_launcher.h @@ -43,7 +43,7 @@ class WindowTypeLauncher : public views::WidgetDelegateView, // Overridden from views::WidgetDelegate: virtual views::View* GetContentsView() OVERRIDE; virtual bool CanResize() const OVERRIDE; - virtual string16 GetWindowTitle() const OVERRIDE; + virtual std::wstring GetWindowTitle() const OVERRIDE; virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE; // Overridden from views::ButtonListener: |