Change std::wstring to string16 on WidgetDelegate::GetWindowTitle

Review URL: http://codereview.chromium.org/8065001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103102 0039d316-1c4b-4281-b951-d872f2087c98

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 875a077..242cc88 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());
 }
 
-std::wstring ToplevelWindow::GetWindowTitle() const {
-  return L"Examples: Toplevel Window";
+string16 ToplevelWindow::GetWindowTitle() const {
+  return ASCIIToUTF16("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 8b61743..49757ce 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 std::wstring GetWindowTitle() const OVERRIDE;
+  virtual string16 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 e620088..b4a9681 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;
 }
 
-std::wstring WindowTypeLauncher::GetWindowTitle() const {
-  return L"Examples: Window Builder";
+string16 WindowTypeLauncher::GetWindowTitle() const {
+  return ASCIIToUTF16("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 aab1126..9fb6eaf 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 std::wstring GetWindowTitle() const OVERRIDE;
+  virtual string16 GetWindowTitle() const OVERRIDE;
   virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
 
   // Overridden from views::ButtonListener: