diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 06:57:01 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 06:57:01 +0000 |
| commit | 730718e87bf37f12c934c62ef5cba922527a2db6 (patch) | |
| tree | 6413633c8f88b79619825d5a157c41ba58f00b00 /chrome/browser/ui/views/global_error_bubble_view.cc | |
| parent | 20f1870eda54d1bde430f2e6b33c9cdf3c0ce4a1 (diff) | |
| download | chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.zip chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.tar.gz chromium_src-730718e87bf37f12c934c62ef5cba922527a2db6.tar.bz2 | |
Change std::wstring to string16 for views::Label and views::Label
Redo for CR=8113031, it failed on linux_chromeos_clang.
Following files are missed in CR=8113031
1 chrome/browser/chromeos/drop_shadow_label.cc
2 chrome/browser/chromeos/drop_shadow_label.h
3 chrome/browser/ui/views/cookie_info_view.cc
4 chrome/browser/ui/views/database_info_view.cc
5 chrome/browser/ui/views/hung_renderer_view.cccc
6 chrome/browser/ui/views/importer/import_lock_dialog_view.cc
7 chrome/browser/ui/views/task_manager_view.cc
8 ui/aura_shell/examples/bubble.cc
9 views/examples/bubble_example.cc
10 views/examples/link_example.cc
11 views/examples/native_theme_button_example.cc
12 views/examples/text_example.cc
13 views/examples/textfield_example.cc
BUG=68267
TEST=no user visible changes
Review URL: http://codereview.chromium.org/8162013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104445 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); |