summaryrefslogtreecommitdiffstats
path: root/views/examples
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:33:53 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 03:33:53 +0000
commit9dcdaae34846e064b2fdf173fb1796468a6db816 (patch)
treef7eae503ff1dc90af44969e05a0d298c6b02944b /views/examples
parent78650b461b811a1abedff20e6b5d665505cd8ec4 (diff)
downloadchromium_src-9dcdaae34846e064b2fdf173fb1796468a6db816.zip
chromium_src-9dcdaae34846e064b2fdf173fb1796468a6db816.tar.gz
chromium_src-9dcdaae34846e064b2fdf173fb1796468a6db816.tar.bz2
views: Change MessageBoxView API to string16.
BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8221015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/examples')
-rw-r--r--views/examples/message_box_example.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/views/examples/message_box_example.cc b/views/examples/message_box_example.cc
index b46eb63..6d7d8f53 100644
--- a/views/examples/message_box_example.cc
+++ b/views/examples/message_box_example.cc
@@ -20,14 +20,16 @@ MessageBoxExample::~MessageBoxExample() {
void MessageBoxExample::CreateExampleView(views::View* container) {
message_box_view_ = new views::MessageBoxView(
- 0, L"Message Box Message", L"Default Prompt");
+ 0,
+ ASCIIToUTF16("Message Box Message"),
+ ASCIIToUTF16("Default Prompt"));
status_ = new views::TextButton(this, L"Show Status");
toggle_ = new views::TextButton(this, L"Toggle Checkbox");
views::GridLayout* layout = new views::GridLayout(container);
container->SetLayoutManager(layout);
- message_box_view_->SetCheckBoxLabel(L"Check Box");
+ message_box_view_->SetCheckBoxLabel(ASCIIToUTF16("Check Box"));
const int message_box_column = 0;
views::ColumnSet* column_set = layout->AddColumnSet(message_box_column);
@@ -53,7 +55,7 @@ void MessageBoxExample::ButtonPressed(views::Button* sender,
const views::Event& event) {
if (sender == status_) {
message_box_view_->SetCheckBoxLabel(
- ASCIIToWide(BoolToOnOff(message_box_view_->IsCheckBoxSelected())));
+ ASCIIToUTF16(BoolToOnOff(message_box_view_->IsCheckBoxSelected())));
PrintStatus(message_box_view_->IsCheckBoxSelected() ?
"Check Box Selected" : "Check Box Not Selected");
} else if (sender == toggle_) {