summaryrefslogtreecommitdiffstats
path: root/ui/aura_shell/examples/toplevel_window.h
diff options
context:
space:
mode:
authoryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
committeryosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 08:49:04 +0000
commitd9ae4d466b2bf5d2ed3c5d12c855a94d1ecc034c (patch)
treeb3215901378d4ced136abc04494204095fe7714d /ui/aura_shell/examples/toplevel_window.h
parent09e14d69cad45e0a11720793ad110545592f85ae (diff)
downloadchromium_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/examples/toplevel_window.h')
-rw-r--r--ui/aura_shell/examples/toplevel_window.h2
1 files changed, 1 insertions, 1 deletions
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;