Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: views/controls/message_box_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/link.cc ('k') | views/examples/examples_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/message_box_view.cc
===================================================================
--- views/controls/message_box_view.cc (revision 104083)
+++ views/controls/message_box_view.cc (working copy)
@@ -32,7 +32,7 @@
const std::wstring& message,
const std::wstring& default_prompt,
int message_width)
- : message_label_(new Label(WideToUTF16Hack(message))),
+ : message_label_(new Label(message)),
prompt_field_(NULL),
icon_(NULL),
checkbox_(NULL),
@@ -43,7 +43,7 @@
MessageBoxView::MessageBoxView(int dialog_flags,
const std::wstring& message,
const std::wstring& default_prompt)
- : message_label_(new Label(WideToUTF16Hack(message))),
+ : message_label_(new Label(message)),
prompt_field_(NULL),
icon_(NULL),
checkbox_(NULL),
@@ -119,7 +119,7 @@
return false;
ui::ScopedClipboardWriter scw(clipboard);
- scw.WriteText(message_label_->GetText());
+ scw.WriteText(WideToUTF16Hack(message_label_->GetText()));
return true;
}
@@ -135,7 +135,7 @@
// with strong directionality.
base::i18n::TextDirection direction =
base::i18n::GetFirstStrongCharacterDirection(
- message_label_->GetText());
+ WideToUTF16(message_label_->GetText()));
Label::Alignment alignment;
if (direction == base::i18n::RIGHT_TO_LEFT)
alignment = Label::ALIGN_RIGHT;
« no previous file with comments | « views/controls/link.cc ('k') | views/examples/examples_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698