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

3 files changed, 9 insertions, 8 deletions

diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index 31aa7dd..46ad02b 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 = WideToUTF16(widget_delegate_->GetAccessibleWindowTitle());
+    window_title = widget_delegate_->GetAccessibleWindowTitle();
   } else {
-    window_title = WideToUTF16(widget_delegate_->GetWindowTitle());
+    window_title = 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 0aae7bd..d206626 100644
--- a/views/widget/widget_delegate.cc
+++ b/views/widget/widget_delegate.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -63,12 +64,12 @@ ui::AccessibilityTypes::State WidgetDelegate::GetAccessibleWindowState() const {
   return 0;
 }
 
-std::wstring WidgetDelegate::GetAccessibleWindowTitle() const {
+string16 WidgetDelegate::GetAccessibleWindowTitle() const {
   return GetWindowTitle();
 }
 
-std::wstring WidgetDelegate::GetWindowTitle() const {
-  return L"";
+string16 WidgetDelegate::GetWindowTitle() const {
+  return string16();
 }
 
 bool WidgetDelegate::ShouldShowWindowTitle() const {
diff --git a/views/widget/widget_delegate.h b/views/widget/widget_delegate.h
index 6fe77ba..8e56c65 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 std::wstring GetAccessibleWindowTitle() const;
+  virtual string16 GetAccessibleWindowTitle() const;
 
   // Returns the text to be displayed in the window title.
-  virtual std::wstring GetWindowTitle() const;
+  virtual string16 GetWindowTitle() const;
 
   // Returns true if the window should show a title in the title bar.
   virtual bool ShouldShowWindowTitle() const;