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

chrome/browser/ui/panels/panel_browser_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/ui/panels/panel_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/panels/panel.h"
@@ skipping 259 matching lines @@
       l10n_util::GetStringUTF16(IDS_TOOLTIP_CLOSE_TAB));
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
   title_icon_ = new TabIconView(this);
   title_icon_->set_is_light(true);
   AddChildView(title_icon_);
   title_icon_->Update();
 
-  title_label_ = new views::Label(string16());
+  title_label_ = new views::Label(std::wstring());
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(title_label_);
 
   mouse_watcher_.reset(new MouseWatcher(this));
 }
 
 PanelBrowserFrameView::~PanelBrowserFrameView() {
 }
 
 gfx::Rect PanelBrowserFrameView::GetBoundsForTabStrip(
@@ skipping 392 matching lines @@
       client_area_bottom);
 
   // Draw the left edge.
   canvas->TileImageInt(
       *(client_edges.left),
       client_view_bounds_.x() - client_edges.left->width(),
       client_area_top, client_edges.left->width(), client_area_height);
 }
 
 void PanelBrowserFrameView::UpdateTitleBar() {
-  title_label_->SetText(frame_->widget_delegate()->GetWindowTitle());
+  title_label_->SetText(
+      UTF16ToWideHack(frame_->widget_delegate()->GetWindowTitle()));
 }
 
 void PanelBrowserFrameView::OnFocusChanged(bool focused) {
   UpdateSettingsButtonVisibility(focused,
                                  mouse_watcher_->IsCursorInViewBounds());
   SchedulePaint();
 }
 
 void PanelBrowserFrameView::OnMouseEnterOrLeaveWindow(bool mouse_entered) {
   // Panel might be closed when we still watch the mouse event.
@@ skipping 37 matching lines @@
 
   settings_menu_model_.reset(
       new PanelSettingsMenuModel(browser_view_->panel()));
   settings_menu_adapter_.reset(
       new views::MenuModelAdapter(settings_menu_model_.get()));
   settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
   settings_menu_adapter_->BuildMenu(settings_menu_);
   settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
   return true;
 }