Fix ChromeOS Bustage: Use string16 instead of wstring.

BUG=none
TEST=none
TBR=sky

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

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

5 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/views/tabs/browser_tab_strip_controller.cc
index 3f0315f..2b4706e 100644
--- a/chrome/browser/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/views/tabs/browser_tab_strip_controller.cc
@@ -26,7 +26,7 @@ SkBitmap BrowserTabStripController::GetIcon(int index) const {
   return model_->GetTabContentsAt(index)->GetFavIcon();
 }
 
-std::wstring BrowserTabStripController::GetTitle(int index) const {
+string16 BrowserTabStripController::GetTitle(int index) const {
   return model_->GetTabContentsAt(index)->GetTitle();
 }
 
diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.h b/chrome/browser/views/tabs/browser_tab_strip_controller.h
index db01885..4db5fde 100644
--- a/chrome/browser/views/tabs/browser_tab_strip_controller.h
+++ b/chrome/browser/views/tabs/browser_tab_strip_controller.h
@@ -18,7 +18,7 @@ class BrowserTabStripController : public SideTabStripModel,
 
   // SideTabStripModel implementation:
   virtual SkBitmap GetIcon(int index) const;
-  virtual std::wstring GetTitle(int index) const;
+  virtual string16 GetTitle(int index) const;
   virtual bool IsSelected(int index) const;
 
   // TabStripModelObserver implementation:
diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h
index 5a32869..767b649 100644
--- a/chrome/browser/views/tabs/side_tab.h
+++ b/chrome/browser/views/tabs/side_tab.h
@@ -14,7 +14,7 @@ class SideTab;
 class SideTabModel {
  public:
   // Returns metadata about the specified |tab|.
-  virtual std::wstring GetTitle(SideTab* tab) const = 0;
+  virtual string16 GetTitle(SideTab* tab) const = 0;
   virtual SkBitmap GetIcon(SideTab* tab) const = 0;
   virtual bool IsSelected(SideTab* tab) const = 0;
 };
diff --git a/chrome/browser/views/tabs/side_tab_strip.cc b/chrome/browser/views/tabs/side_tab_strip.cc
index e487769..3ea8a3d 100644
--- a/chrome/browser/views/tabs/side_tab_strip.cc
+++ b/chrome/browser/views/tabs/side_tab_strip.cc
@@ -67,7 +67,7 @@ void SideTabStrip::UpdateTabAt(int index) {
 ////////////////////////////////////////////////////////////////////////////////
 // SideTabStrip, SideTabModel implementation:
 
-std::wstring SideTabStrip::GetTitle(SideTab* tab) const {
+string16 SideTabStrip::GetTitle(SideTab* tab) const {
   return model_->GetTitle(GetIndexOfSideTab(tab));
 }
 
diff --git a/chrome/browser/views/tabs/side_tab_strip.h b/chrome/browser/views/tabs/side_tab_strip.h
index 6b588ee..4cde29f 100644
--- a/chrome/browser/views/tabs/side_tab_strip.h
+++ b/chrome/browser/views/tabs/side_tab_strip.h
@@ -15,7 +15,7 @@ class SideTabStripModel {
  public:
   // Returns metadata about the tab at the specified index.
   virtual SkBitmap GetIcon(int index) const = 0;
-  virtual std::wstring GetTitle(int index) const = 0;
+  virtual string16 GetTitle(int index) const = 0;
   virtual bool IsSelected(int index) const = 0;
 };
 
@@ -50,7 +50,7 @@ class SideTabStrip : public BaseTabStrip,
   void UpdateTabAt(int index);
 
   // SideTabModel implementation:
-  virtual std::wstring GetTitle(SideTab* tab) const;
+  virtual string16 GetTitle(SideTab* tab) const;
   virtual SkBitmap GetIcon(SideTab* tab) const;
   virtual bool IsSelected(SideTab* tab) const;