Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1596)

Unified Diff: chrome/browser/ui/panels/panel_browser_frame_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/input_window_dialog_win.cc ('k') | chrome/browser/ui/views/about_chrome_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_browser_frame_view.cc
===================================================================
--- chrome/browser/ui/panels/panel_browser_frame_view.cc (revision 104083)
+++ chrome/browser/ui/panels/panel_browser_frame_view.cc (working copy)
@@ -277,7 +277,7 @@
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_);
@@ -690,7 +690,8 @@
}
void PanelBrowserFrameView::UpdateTitleBar() {
- title_label_->SetText(frame_->widget_delegate()->GetWindowTitle());
+ title_label_->SetText(
+ UTF16ToWideHack(frame_->widget_delegate()->GetWindowTitle()));
}
void PanelBrowserFrameView::OnFocusChanged(bool focused) {
« no previous file with comments | « chrome/browser/ui/input_window_dialog_win.cc ('k') | chrome/browser/ui/views/about_chrome_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698