Revert 71167 - Remove wstring from gfx....

views/controls/label.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/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "app/resource_bundle.h"
@@ skipping 253 matching lines @@
   if (is_multi_line_) {
     text_size_valid_ = false;
     PreferredSizeChanged();
   }
 }
 
 void Label::PaintText(gfx::Canvas* canvas,
                       const std::wstring& text,
                       const gfx::Rect& text_bounds,
                       int flags) {
-  canvas->DrawStringInt(WideToUTF16Hack(text), font_, color_,
+  canvas->DrawStringInt(text, font_, color_,
                         text_bounds.x(), text_bounds.y(),
                         text_bounds.width(), text_bounds.height(), flags);
 
   if (HasFocus() || paint_as_focused_) {
     gfx::Rect focus_bounds = text_bounds;
     focus_bounds.Inset(-kFocusBorderPadding, -kFocusBorderPadding);
     canvas->DrawFocusRect(focus_bounds.x(), focus_bounds.y(),
                           focus_bounds.width(), focus_bounds.height());
   }
 }
@@ skipping 161 matching lines @@
         font_, GetAvailableRect().width(), true));
   } else {
     *paint_text = UTF16ToWideHack(text_);
   }
 
   *text_bounds = GetTextBounds();
   *flags = ComputeMultiLineFlags();
 }
 
 }  // namespace views