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

chrome/browser/gtk/tabs/tab_renderer_gtk.cc

 // Copyright (c) 2009 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/gtk/tabs/tab_renderer_gtk.h"
 
 #include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser.h"
@@ skipping 178 matching lines @@
   hover_animation_->SetSlideDuration(kHoverDurationMs);
 }
 
 TabRendererGtk::~TabRendererGtk() {
   tab_.Destroy();
 }
 
 void TabRendererGtk::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();
   }
 
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
   data_.loading = contents->is_loading();
   data_.show_icon = contents->ShouldDisplayFavIcon();
 
@@ skipping 105 matching lines @@
 void TabRendererGtk::SetBounds(const gfx::Rect& bounds) {
   gtk_widget_set_size_request(tab_.get(), bounds.width(), bounds.height());
   bounds_ = bounds;
   Layout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk, protected:
 
 std::wstring TabRendererGtk::GetTitle() const {
-  return data_.title;
+  return UTF16ToWideHack(data_.title);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk, AnimationDelegate implementation:
 
 void TabRendererGtk::AnimationProgressed(const Animation* animation) {
   gtk_widget_queue_draw(tab_.get());
 }
 
 void TabRendererGtk::AnimationCanceled(const Animation* animation) {
@@ skipping 77 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 = IsSelected() ? selected_title_color_
                                      : unselected_title_color_;
-  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());
 }
 
 SkBitmap TabRendererGtk::PaintBitmap() {
   gfx::Canvas canvas(width(), height(), false);
   Paint(&canvas);
   return canvas.ExtractBitmap();
 }
 
 void TabRendererGtk::SchedulePaint() {
   gtk_widget_queue_draw(tab_.get());
@@ skipping 307 matching lines @@
   gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 10));
   title_font_height_ = title_font_->height();
 
   InitializeLoadingAnimationData(&rb, &loading_animation_data);
 
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }