Change std::wstring to string16 for views::Label and views::Link

chrome/browser/chromeos/frame/bubble_frame_view.cc

 // Copyright (c) 2011 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/chromeos/frame/bubble_frame_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/chromeos/frame/bubble_window.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ skipping 32 matching lines @@
 
 BubbleFrameView::BubbleFrameView(views::Widget* frame,
                                  views::WidgetDelegate* widget_delegate,
                                  BubbleWindowStyle style)
     : frame_(frame),
       style_(style),
       title_(NULL),
       close_button_(NULL),
       throbber_(NULL) {
   if (widget_delegate->ShouldShowWindowTitle()) {
-    title_ = new views::Label(
-        UTF16ToWideHack(widget_delegate->GetWindowTitle()));
+    title_ = new views::Label(widget_delegate->GetWindowTitle());
     title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     title_->SetFont(title_->font().DeriveFont(kFontSizeCorrectionDelta,
                                               gfx::Font::BOLD));
     AddChildView(title_);
   }
 
   if (style_ & STYLE_XBAR) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::BS_NORMAL,
@@ skipping 10 matching lines @@
     AddChildView(throbber_);
   }
 }
 
 BubbleFrameView::~BubbleFrameView() {
 }
 
 void BubbleFrameView::StartThrobber() {
   DCHECK(throbber_ != NULL);
   if (title_)
-    title_->SetText(std::wstring());
+    title_->SetText(string16());
   throbber_->Start();
 }
 
 void BubbleFrameView::StopThrobber() {
   DCHECK(throbber_ != NULL);
   throbber_->Stop();
   if (title_)
-    title_->SetText(
-        UTF16ToWideHack(frame_->widget_delegate()->GetWindowTitle()));
+    title_->SetText(frame_->widget_delegate()->GetWindowTitle());
 }
 
 gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
   return client_view_bounds_;
 }
 
 gfx::Rect BubbleFrameView::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Insets insets = GetInsets();
 
@@ skipping 113 matching lines @@
   canvas->AsCanvasSkia()->drawPath(path, paint);
 }
 
 void BubbleFrameView::ButtonPressed(views::Button* sender,
                                     const views::Event& event) {
   if (close_button_ != NULL && sender == close_button_)
     frame_->Close();
 }
 
 }  // namespace chromeos