| 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 {
|
|
|