3 files changed, 14 insertions, 18 deletions
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_