diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 08:29:26 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 08:29:26 +0000 |
| commit | b36980b1c9726783cca0118aae333f5cd7d0ef49 (patch) | |
| tree | d312ee7ca5be8152d3e6fa6064f3320b825d4ecb /chrome/browser/chromeos/frame/panel_controller.cc | |
| parent | 7b937360dc15b2746cc601620a33a7273a4eb86b (diff) | |
| download | chromium_src-b36980b1c9726783cca0118aae333f5cd7d0ef49.zip chromium_src-b36980b1c9726783cca0118aae333f5cd7d0ef49.tar.gz chromium_src-b36980b1c9726783cca0118aae333f5cd7d0ef49.tar.bz2 | |
Change std::wstring to string16 for views::Link
Change wst::string to string16 for view::Label and views::Link
BUG=68267
TEST=no user visible changes
Review URL: http://codereview.chromium.org/8113031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/frame/panel_controller.cc')
| -rw-r--r-- | chrome/browser/chromeos/frame/panel_controller.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index a81beff..916776f 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -211,7 +211,7 @@ void PanelController::Init(bool initial_focus, 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_); @@ -222,8 +222,7 @@ void PanelController::Init(bool initial_focus, void PanelController::UpdateTitleBar() { if (!delegate_ || !title_window_) return; - title_content_->title_label()->SetText( - UTF16ToWideHack(delegate_->GetPanelTitle())); + title_content_->title_label()->SetText(delegate_->GetPanelTitle()); title_content_->title_icon()->SetImage(delegate_->GetPanelIcon()); } @@ -440,7 +439,7 @@ PanelController::TitleContentView::TitleContentView( title_icon_ = new views::ImageView(); AddChildView(title_icon_); - title_label_ = new views::Label(std::wstring()); + title_label_ = new views::Label(string16()); title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT); AddChildView(title_label_); |