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/speech/speech_input_bubble_views.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/speech/speech_input_bubble_views.cc')
| -rw-r--r-- | chrome/browser/speech/speech_input_bubble_views.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 293d850..f502c8b 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -83,13 +83,13 @@ ContentView::ContentView(SpeechInputBubbleDelegate* delegate) const gfx::Font& font = rb.GetFont(ResourceBundle::MediumFont); heading_ = new views::Label( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING))); + l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING)); heading_->set_border(views::Border::CreateEmptyBorder( kBubbleHeadingVertMargin, 0, kBubbleHeadingVertMargin, 0)); heading_->SetFont(font); heading_->SetHorizontalAlignment(views::Label::ALIGN_CENTER); - heading_->SetText(UTF16ToWide( - l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING))); + heading_->SetText( + l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_BUBBLE_HEADING)); AddChildView(heading_); message_ = new views::Label(); @@ -113,7 +113,7 @@ ContentView::ContentView(SpeechInputBubbleDelegate* delegate) AddChildView(try_again_); mic_settings_ = new views::Link( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_MIC_SETTINGS))); + l10n_util::GetStringUTF16(IDS_SPEECH_INPUT_MIC_SETTINGS)); mic_settings_->set_listener(this); AddChildView(mic_settings_); } @@ -131,7 +131,7 @@ void ContentView::UpdateLayout(SpeechInputBubbleBase::DisplayMode mode, heading_->SetVisible(mode == SpeechInputBubbleBase::DISPLAY_MODE_RECORDING); if (is_message) { - message_->SetText(UTF16ToWideHack(message_text)); + message_->SetText(message_text); } else { SetImage(image); } |