Revert 71167 - Remove wstring from gfx....

views/window/custom_frame_view.cc

 // Copyright (c) 2010 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 "views/window/custom_frame_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
@@ skipping 395 matching lines @@
 
 void CustomFrameView::PaintTitleBar(gfx::Canvas* canvas) {
   WindowDelegate* d = frame_->GetDelegate();
 
   // It seems like in some conditions we can be asked to paint after the window
   // that contains us is WM_DESTROYed. At this point, our delegate is NULL. The
   // correct long term fix may be to shut down the RootView in WM_DESTROY.
   if (!d)
     return;
 
-  canvas->DrawStringInt(WideToUTF16Hack(d->GetWindowTitle()), *title_font_,
-                        SK_ColorWHITE, MirroredLeftPointForRect(title_bounds_),
-                        title_bounds_.y(), title_bounds_.width(),
-                        title_bounds_.height());
+  canvas->DrawStringInt(d->GetWindowTitle(), *title_font_, SK_ColorWHITE,
+      MirroredLeftPointForRect(title_bounds_), title_bounds_.y(),
+      title_bounds_.width(), title_bounds_.height());
 }
 
 void CustomFrameView::PaintRestoredClientEdge(gfx::Canvas* canvas) {
   gfx::Rect client_area_bounds = frame_->GetClientView()->bounds();
   int client_area_top = client_area_bounds.y();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   SkBitmap* top_left = rb.GetBitmapNamed(IDR_APP_TOP_LEFT);
   SkBitmap* top = rb.GetBitmapNamed(IDR_APP_TOP_CENTER);
   SkBitmap* top_right = rb.GetBitmapNamed(IDR_APP_TOP_RIGHT);
@@ skipping 144 matching lines @@
     title_font_ = new gfx::Font(app::win::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO(ben): need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views