Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/chromeos/frame/panel_controller.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/panel_controller.h"
 
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 193 matching lines @@
   type_params.push_back(initial_focus ? 1 : 0);
   type_params.push_back(creator_xid);
   type_params.push_back(resize_type);
   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(panel_),
       WM_IPC_WINDOW_CHROME_PANEL_CONTENT,
       &type_params);
 
   client_event_handler_id_ = g_signal_connect(
       panel_, "client-event", G_CALLBACK(OnPanelClientEvent), this);
-#endif  // !USE_AURA
+#endif // !USE_AURA
 
   title_content_ = new TitleContentView(this);
   title_window_->SetContentsView(title_content_);
   UpdateTitleBar();
   title_window_->Show();
 }
 
 void PanelController::UpdateTitleBar() {
   if (!delegate_ || !title_window_)
     return;
-  title_content_->title_label()->SetText(delegate_->GetPanelTitle());
+  title_content_->title_label()->SetText(
+      UTF16ToWideHack(delegate_->GetPanelTitle()));
   title_content_->title_icon()->SetImage(delegate_->GetPanelIcon());
 }
 
 void PanelController::SetUrgent(bool urgent) {
   if (!urgent)
     urgent_cleared_time_ = base::TimeTicks::Now();
   if (urgent == urgent_)
     return;
   if (urgent && focused_)
     return;  // Don't set urgency for focused panels.
@@ skipping 196 matching lines @@
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL, close_button_n);
   close_button_->SetImage(views::CustomButton::BS_HOT, close_button_h);
   close_button_->SetImage(views::CustomButton::BS_PUSHED, close_button_p);
   close_button_->SetBackground(
       kTitleCloseButtonColor, close_button_n, close_button_m);
   AddChildView(close_button_);
 
   title_icon_ = new views::ImageView();
   AddChildView(title_icon_);
-  title_label_ = new views::Label(string16());
+  title_label_ = new views::Label(std::wstring());
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(title_label_);
 
   set_background(
       views::Background::CreateBackgroundPainter(
           true, new TitleBackgroundPainter(panel_controller)));
   OnFocusOut();
 }
 
 void PanelController::TitleContentView::Layout() {
@@ skipping 58 matching lines @@
     views::Button* sender, const views::Event& event) {
   if (panel_controller_ && sender == close_button_)
     panel_controller_->OnCloseButtonPressed();
 }
 
 PanelController::TitleContentView::~TitleContentView() {
   VLOG(1) << "panel: delete " << this;
 }
 
 }  // namespace chromeos