| Index: chrome/browser/ui/panels/panel_browser_frame_view.cc
|
| diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc
|
| index b76a1e1406398442b388c39337925d08cb2959ec..f0922fc77cbe1b41902d8f1d14c164f91e143d7f 100644
|
| --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc
|
| +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc
|
| @@ -277,7 +277,7 @@ PanelBrowserFrameView::PanelBrowserFrameView(BrowserFrame* frame,
|
| AddChildView(title_icon_);
|
| title_icon_->Update();
|
|
|
| - title_label_ = new views::Label(std::wstring());
|
| + title_label_ = new views::Label(string16());
|
| title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
|
| AddChildView(title_label_);
|
|
|
| @@ -690,8 +690,7 @@ void PanelBrowserFrameView::PaintClientEdge(gfx::Canvas* canvas) {
|
| }
|
|
|
| void PanelBrowserFrameView::UpdateTitleBar() {
|
| - title_label_->SetText(
|
| - UTF16ToWideHack(frame_->widget_delegate()->GetWindowTitle()));
|
| + title_label_->SetText(frame_->widget_delegate()->GetWindowTitle());
|
| }
|
|
|
| void PanelBrowserFrameView::OnFocusChanged(bool focused) {
|
|
|