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/ui/views/global_error_bubble_view.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/ui/views/global_error_bubble_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/global_error_bubble_view.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index ff9be84..234181f 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc @@ -31,7 +31,7 @@ const int kTitleHorizontalPadding = 3; // The vertical offset of the wrench bubble from the wrench menu button. const int kWrenchBubblePointOffsetY = 6; -} // namespace +} // namespace GlobalErrorBubbleView::GlobalErrorBubbleView(Browser* browser, GlobalError* error) @@ -43,15 +43,13 @@ GlobalErrorBubbleView::GlobalErrorBubbleView(Browser* browser, image_view->SetImage(rb.GetImageNamed(resource_id).ToSkBitmap()); string16 title_string(error_->GetBubbleViewTitle()); - scoped_ptr<views::Label> title_label( - new views::Label(UTF16ToWideHack(title_string))); + scoped_ptr<views::Label> title_label(new views::Label(title_string)); title_label->SetMultiLine(true); title_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); title_label->SetFont(title_label->font().DeriveFont(1)); string16 message_string(error_->GetBubbleViewMessage()); - scoped_ptr<views::Label> message_label( - new views::Label(UTF16ToWideHack(message_string))); + scoped_ptr<views::Label> message_label(new views::Label(message_string)); message_label->SetMultiLine(true); message_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT); |