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

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include <limits>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
@@ skipping 258 matching lines @@
     return theme_provider_;
 
   // return contents->profile()->GetThemeProvider();
   NOTREACHED() << "Unable to find a theme provider";
   return NULL;
 }
 
 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();
   }
 
   // TODO(glen): Temporary hax.
   theme_provider_ = contents->profile()->GetThemeProvider();
 
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
@@ skipping 80 matching lines @@
   gfx::Size standard_size = GetMinimumUnselectedSize();
   standard_size.set_width(
       standard_size.width() + kFavIconTitleSpacing + kStandardTitleWidth);
   return standard_size;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, protected:
 
 std::wstring TabRenderer::GetTitle() const {
-  return data_.title;
+  return UTF16ToWideHack(data_.title);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRenderer, views::View overrides:
 
 void TabRenderer::Paint(gfx::Canvas* canvas) {
   // Don't paint if we're narrower than we can render correctly. (This should
   // only happen during animations).
   if (width() < GetMinimumUnselectedSize().width())
     return;
@@ skipping 34 matching lines @@
                                 favicon_bounds_.y() + fav_icon_hiding_offset_,
                                 kFaviconSize, kFaviconSize,
                                 true);
         }
       }
       canvas->restore();
     }
   }
 
   // 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);
   }
 
   SkColor title_color = GetThemeProvider()->
       GetColor(IsSelected() ?
           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() {
   gfx::Rect lb = GetLocalBounds(false);
   if (lb.IsEmpty())
     return;
   lb.Inset(kLeftPadding, kTopPadding, kRightPadding, kBottomPadding);
 
   // First of all, figure out who is tallest.
   int content_height = GetContentHeight();
@@ skipping 325 matching lines @@
   tab_inactive.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT);
   tab_inactive.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER);
   tab_inactive.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT);
 
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
 
   loading_animation_frames = rb.GetBitmapNamed(IDR_THROBBER);
   waiting_animation_frames = rb.GetBitmapNamed(IDR_THROBBER_WAITING);
 }