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 /views/controls/message_box_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 'views/controls/message_box_view.cc')
| -rw-r--r-- | views/controls/message_box_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index cd51b67..a11edbd 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -32,7 +32,7 @@ MessageBoxView::MessageBoxView(int dialog_flags, const std::wstring& message, const std::wstring& default_prompt, int message_width) - : message_label_(new Label(message)), + : message_label_(new Label(WideToUTF16Hack(message))), prompt_field_(NULL), icon_(NULL), checkbox_(NULL), @@ -43,7 +43,7 @@ MessageBoxView::MessageBoxView(int dialog_flags, MessageBoxView::MessageBoxView(int dialog_flags, const std::wstring& message, const std::wstring& default_prompt) - : message_label_(new Label(message)), + : message_label_(new Label(WideToUTF16Hack(message))), prompt_field_(NULL), icon_(NULL), checkbox_(NULL), @@ -119,7 +119,7 @@ bool MessageBoxView::AcceleratorPressed( return false; ui::ScopedClipboardWriter scw(clipboard); - scw.WriteText(WideToUTF16Hack(message_label_->GetText())); + scw.WriteText(message_label_->GetText()); return true; } @@ -135,7 +135,7 @@ void MessageBoxView::Init(int dialog_flags, // with strong directionality. base::i18n::TextDirection direction = base::i18n::GetFirstStrongCharacterDirection( - WideToUTF16(message_label_->GetText())); + message_label_->GetText()); Label::Alignment alignment; if (direction == base::i18n::RIGHT_TO_LEFT) alignment = Label::ALIGN_RIGHT; |