summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 02:12:40 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 02:12:40 +0000
commit3a54c8d27749347d4e92b3edacd335eedf7765cd (patch)
tree6dfcdf55a565afd432ae5226965e2d72cee7d2b7 /views/window
parentd1282c219c49e2a8baa4326ac1b847f9c24e0c6d (diff)
downloadchromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.zip
chromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.tar.gz
chromium_src-3a54c8d27749347d4e92b3edacd335eedf7765cd.tar.bz2
Revert 105998 - views: Change TextButtonBase API to string16.
BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8262003 TBR=tfarina@chromium.org Review URL: http://codereview.chromium.org/8329010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/dialog_client_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 4c571c2..5569df0 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -47,7 +47,7 @@ void UpdateButtonHelper(NativeTextButton* button_view,
MessageBoxFlags::DialogButton button) {
string16 label = delegate->GetDialogButtonLabel(button);
if (!label.empty())
- button_view->SetText(label);
+ button_view->SetText(UTF16ToWideHack(label));
button_view->SetEnabled(delegate->IsDialogButtonEnabled(button));
button_view->SetVisible(delegate->IsDialogButtonVisible(button));
}