Convert some stuff to string16 so the toolkit_views build can build again

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

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

3 files changed, 15 insertions, 14 deletions

diff --git a/chrome/browser/views/tabs/tab_2.cc b/chrome/browser/views/tabs/tab_2.cc
index 0047cae..14a8188 100644
--- a/chrome/browser/views/tabs/tab_2.cc
+++ b/chrome/browser/views/tabs/tab_2.cc
@@ -460,9 +460,9 @@ void Tab2::PaintTitle(gfx::Canvas* canvas) {
   string16 title = model_->GetTitle(this);
   if (title.empty()) {
     if (model_->IsLoading(this))
-      title = l10n_util::GetString(IDS_TAB_LOADING_TITLE);
+      title = l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE);
     else
-      title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
+      title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE);
   } else {
     Browser::FormatTitleForDisplay(&title);
   }
@@ -472,9 +472,9 @@ void Tab2::PaintTitle(gfx::Canvas* canvas) {
           BrowserThemeProvider::COLOR_TAB_TEXT :
           BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
 
-  canvas->DrawStringInt(title, *title_font, title_color, title_bounds_.x(),
-                        title_bounds_.y(), title_bounds_.width(),
-                        title_bounds_.height());
+  canvas->DrawStringInt(UTF16ToWideHack(title), *title_font, title_color,
+                        title_bounds_.x(), title_bounds_.y(),
+                        title_bounds_.width(), title_bounds_.height());
 }
 
 void Tab2::PaintTabBackground(gfx::Canvas* canvas) {
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 5481387..47d139b 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -276,7 +276,7 @@ ThemeProvider* TabRenderer::GetThemeProvider() {
 void TabRenderer::UpdateData(TabContents* contents, bool loading_only) {
   DCHECK(contents);
   if (!loading_only) {
-    data_.title = UTF16ToWideHack(contents->GetTitle());
+    data_.title = contents->GetTitle();
     data_.off_the_record = contents->profile()->IsOffTheRecord();
     data_.crashed = contents->is_crashed();
     data_.favicon = contents->GetFavIcon();
@@ -377,7 +377,7 @@ gfx::Size TabRenderer::GetStandardSize() {
 // TabRenderer, protected:
 
 std::wstring TabRenderer::GetTitle() const {
-  return data_.title;
+  return UTF16ToWideHack(data_.title);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -432,12 +432,12 @@ void TabRenderer::Paint(gfx::Canvas* canvas) {
   }
 
   // Paint the Title.
-  std::wstring title = data_.title;
+  string16 title = data_.title;
   if (title.empty()) {
     if (data_.loading) {
-      title = l10n_util::GetString(IDS_TAB_LOADING_TITLE);
+      title = l10n_util::GetStringUTF16(IDS_TAB_LOADING_TITLE);
     } else {
-      title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
+      title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE);
     }
   } else {
     Browser::FormatTitleForDisplay(&title);
@@ -448,9 +448,9 @@ void TabRenderer::Paint(gfx::Canvas* canvas) {
           BrowserThemeProvider::COLOR_TAB_TEXT :
           BrowserThemeProvider::COLOR_BACKGROUND_TAB_TEXT);
 
-  canvas->DrawStringInt(title, *title_font, title_color, title_bounds_.x(),
-                        title_bounds_.y(), title_bounds_.width(),
-                        title_bounds_.height());
+  canvas->DrawStringInt(UTF16ToWideHack(title), *title_font, title_color,
+                        title_bounds_.x(), title_bounds_.y(),
+                        title_bounds_.width(), title_bounds_.height());
 }
 
 void TabRenderer::Layout() {
diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h
index d265b53..8042acc 100644
--- a/chrome/browser/views/tabs/tab_renderer.h
+++ b/chrome/browser/views/tabs/tab_renderer.h
@@ -9,6 +9,7 @@
 #include "app/slide_animation.h"
 #include "app/throb_animation.h"
 #include "base/gfx/point.h"
+#include "base/string16.h"
 #include "views/controls/button/image_button.h"
 #include "views/view.h"
 
@@ -165,7 +166,7 @@ class TabRenderer : public views::View,
   // corresponding objects in the underlying model.
   struct TabData {
     SkBitmap favicon;
-    std::wstring title;
+    string16 title;
     bool loading;
     bool crashed;
     bool off_the_record;