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

10 files changed, 28 insertions, 36 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;
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc
index a19cc4d..ebee039 100644
--- a/views/desktop/desktop_main.cc
+++ b/views/desktop/desktop_main.cc
@@ -6,7 +6,6 @@
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/process_util.h"
-#include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "views/desktop/desktop_views_delegate.h"
@@ -68,11 +67,9 @@ int main(int argc, char** argv) {
   views::desktop::DesktopWindowView::CreateDesktopWindow(
       views::desktop::DesktopWindowView::DESKTOP_DEFAULT);
   views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow(
-      ASCIIToUTF16("Sample Window 1"), SK_ColorWHITE,
-      gfx::Rect(500, 200, 400, 400), true);
+      L"Sample Window 1", SK_ColorWHITE, gfx::Rect(500, 200, 400, 400), true);
   views::desktop::DesktopWindowView::desktop_window_view->CreateTestWindow(
-      ASCIIToUTF16("Sample Window 2"), SK_ColorRED,
-      gfx::Rect(600, 450, 450, 300), false);
+      L"Sample Window 2", SK_ColorRED, gfx::Rect(600, 450, 450, 300), false);
 
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->Run(&accelerator_handler);
diff --git a/views/desktop/desktop_window_view.cc b/views/desktop/desktop_window_view.cc
index d9938f7..c151a4a 100644
--- a/views/desktop/desktop_window_view.cc
+++ b/views/desktop/desktop_window_view.cc
@@ -4,7 +4,6 @@
 
 #include "views/desktop/desktop_window_view.h"
 
-#include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/transform.h"
 #include "views/desktop/desktop_background.h"
@@ -63,7 +62,7 @@ class DesktopWindow : public Widget {
 
 class TestWindowContentView : public WidgetDelegateView {
  public:
-  TestWindowContentView(const string16& title, SkColor color)
+  TestWindowContentView(const std::wstring& title, SkColor color)
       : title_(title),
         color_(color) {
   }
@@ -76,7 +75,7 @@ class TestWindowContentView : public WidgetDelegateView {
   }
 
   // Overridden from WindowDelegate:
-  virtual string16 GetWindowTitle() const OVERRIDE {
+  virtual std::wstring GetWindowTitle() const OVERRIDE {
     return title_;
   }
   virtual View* GetContentsView() {
@@ -94,7 +93,7 @@ class TestWindowContentView : public WidgetDelegateView {
     return true;
   }
 
-  string16 title_;
+  std::wstring title_;
   SkColor color_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowContentView);
@@ -151,7 +150,7 @@ void DesktopWindowView::CreateDesktopWindow(DesktopType type) {
   window->Show();
 }
 
-void DesktopWindowView::CreateTestWindow(const string16& title,
+void DesktopWindowView::CreateTestWindow(const std::wstring& title,
                                          SkColor color,
                                          gfx::Rect initial_bounds,
                                          bool rotate) {
@@ -226,8 +225,8 @@ bool DesktopWindowView::CanMaximize() const {
   return CanResize();
 }
 
-string16 DesktopWindowView::GetWindowTitle() const {
-  return ASCIIToUTF16("Aura Desktop");
+std::wstring DesktopWindowView::GetWindowTitle() const {
+  return L"Aura Desktop";
 }
 
 SkBitmap DesktopWindowView::GetWindowAppIcon() {
diff --git a/views/desktop/desktop_window_view.h b/views/desktop/desktop_window_view.h
index fadc04e..9bda347 100644
--- a/views/desktop/desktop_window_view.h
+++ b/views/desktop/desktop_window_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
-#define VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
+#ifndef VIEWS_DESKTOP_DESKTOP_WINDOW_H_
+#define VIEWS_DESKTOP_DESKTOP_WINDOW_H_
 
 #include "base/observer_list.h"
 #include "views/view.h"
@@ -36,12 +36,12 @@ class DesktopWindowView : public WidgetDelegateView {
 
   static DesktopWindowView* desktop_window_view;
 
-  explicit DesktopWindowView(DesktopType type);
+  DesktopWindowView(DesktopType type);
   virtual ~DesktopWindowView();
 
   static void CreateDesktopWindow(DesktopType type);
 
-  void CreateTestWindow(const string16& title,
+  void CreateTestWindow(const std::wstring& title,
                         SkColor color,
                         gfx::Rect initial_bounds,
                         bool rotate);
@@ -65,7 +65,7 @@ class DesktopWindowView : public WidgetDelegateView {
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
   virtual SkBitmap GetWindowAppIcon() OVERRIDE;
   virtual SkBitmap GetWindowIcon() OVERRIDE;
   virtual bool ShouldShowWindowIcon() const OVERRIDE;
@@ -83,4 +83,4 @@ class DesktopWindowView : public WidgetDelegateView {
 }  // namespace desktop
 }  // namespace views
 
-#endif  // VIEWS_DESKTOP_DESKTOP_WINDOW_VIEW_H_
+#endif  // VIEWS_DESKTOP_DESKTOP_WINDOW_H_
diff --git a/views/examples/examples_main.cc b/views/examples/examples_main.cc
index aa015fb..4d3d471 100644
--- a/views/examples/examples_main.cc
+++ b/views/examples/examples_main.cc
@@ -125,8 +125,8 @@ bool ExamplesMain::CanMaximize() const {
   return true;
 }
 
-string16 ExamplesMain::GetWindowTitle() const {
-  return ASCIIToUTF16("Views Examples");
+std::wstring ExamplesMain::GetWindowTitle() const {
+  return L"Views Examples";
 }
 
 views::View* ExamplesMain::GetContentsView() {
diff --git a/views/examples/examples_main.h b/views/examples/examples_main.h
index a4278937..93fe344 100644
--- a/views/examples/examples_main.h
+++ b/views/examples/examples_main.h
@@ -41,7 +41,7 @@ class ExamplesMain : public views::WidgetDelegate {
   // views::WidgetDelegate implementation:
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual std::wstring GetWindowTitle() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 46ad02b..31aa7dd 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -330,7 +330,7 @@ void Widget::Init(const InitParams& params) {
 // Unconverted methods (see header) --------------------------------------------
 
 gfx::NativeView Widget::GetNativeView() const {
-  return native_widget_->GetNativeView();
+   return native_widget_->GetNativeView();
 }
 
 gfx::NativeWindow Widget::GetNativeWindow() const {
@@ -676,9 +676,9 @@ void Widget::UpdateWindowTitle() {
   // the native frame is being used, since this also updates the taskbar, etc.
   string16 window_title;
   if (native_widget_->IsScreenReaderActive()) {
-    window_title = widget_delegate_->GetAccessibleWindowTitle();
+    window_title = WideToUTF16(widget_delegate_->GetAccessibleWindowTitle());
   } else {
-    window_title = widget_delegate_->GetWindowTitle();
+    window_title = WideToUTF16(widget_delegate_->GetWindowTitle());
   }
   base::i18n::AdjustStringForLocaleDirection(&window_title);
   native_widget_->SetWindowTitle(window_title);
diff --git a/views/widget/widget_delegate.cc b/views/widget/widget_delegate.cc
index d206626..0aae7bd 100644
--- a/views/widget/widget_delegate.cc
+++ b/views/widget/widget_delegate.cc
@@ -4,7 +4,6 @@
 
 #include "views/widget/widget_delegate.h"
 
-#include "base/utf_string_conversions.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
@@ -64,12 +63,12 @@ ui::AccessibilityTypes::State WidgetDelegate::GetAccessibleWindowState() const {
   return 0;
 }
 
-string16 WidgetDelegate::GetAccessibleWindowTitle() const {
+std::wstring WidgetDelegate::GetAccessibleWindowTitle() const {
   return GetWindowTitle();
 }
 
-string16 WidgetDelegate::GetWindowTitle() const {
-  return string16();
+std::wstring WidgetDelegate::GetWindowTitle() const {
+  return L"";
 }
 
 bool WidgetDelegate::ShouldShowWindowTitle() const {
diff --git a/views/widget/widget_delegate.h b/views/widget/widget_delegate.h
index 8e56c65..6fe77ba 100644
--- a/views/widget/widget_delegate.h
+++ b/views/widget/widget_delegate.h
@@ -71,10 +71,10 @@ class VIEWS_EXPORT WidgetDelegate {
   virtual ui::AccessibilityTypes::State GetAccessibleWindowState() const;
 
   // Returns the title to be read with screen readers.
-  virtual string16 GetAccessibleWindowTitle() const;
+  virtual std::wstring GetAccessibleWindowTitle() const;
 
   // Returns the text to be displayed in the window title.
-  virtual string16 GetWindowTitle() const;
+  virtual std::wstring GetWindowTitle() const;
 
   // Returns true if the window should show a title in the title bar.
   virtual bool ShouldShowWindowTitle() const;
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 504a087..b92dbaa 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -4,8 +4,6 @@
 
 #include "views/window/custom_frame_view.h"
 
-#include <algorithm>
-
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
@@ -416,7 +414,7 @@ void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   if (!d)
     return;
 
-  canvas->DrawStringInt(d->GetWindowTitle(), *title_font_,
+  canvas->DrawStringInt(WideToUTF16Hack(d->GetWindowTitle()), *title_font_,
                         SK_ColorWHITE, GetMirroredXForRect(title_bounds_),
                         title_bounds_.y(), title_bounds_.width(),
                         title_bounds_.height());