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

Unified Diff: chrome/browser/chromeos/frame/bubble_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 | « no previous file | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/frame/bubble_frame_view.cc
===================================================================
--- chrome/browser/chromeos/frame/bubble_frame_view.cc (revision 104083)
+++ chrome/browser/chromeos/frame/bubble_frame_view.cc (working copy)
@@ -50,7 +50,8 @@
close_button_(NULL),
throbber_(NULL) {
if (widget_delegate->ShouldShowWindowTitle()) {
- title_ = new views::Label(widget_delegate->GetWindowTitle());
+ title_ = new views::Label(
+ UTF16ToWideHack(widget_delegate->GetWindowTitle()));
title_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
title_->SetFont(title_->font().DeriveFont(kFontSizeCorrectionDelta,
gfx::Font::BOLD));
@@ -81,7 +82,7 @@
void BubbleFrameView::StartThrobber() {
DCHECK(throbber_ != NULL);
if (title_)
- title_->SetText(string16());
+ title_->SetText(std::wstring());
throbber_->Start();
}
@@ -89,7 +90,8 @@
DCHECK(throbber_ != NULL);
throbber_->Stop();
if (title_)
- title_->SetText(frame_->widget_delegate()->GetWindowTitle());
+ title_->SetText(
+ UTF16ToWideHack(frame_->widget_delegate()->GetWindowTitle()));
}
gfx::Rect BubbleFrameView::GetBoundsForClientView() const {
« no previous file with comments | « no previous file | chrome/browser/chromeos/frame/panel_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698