diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
| commit | 13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5 (patch) | |
| tree | ada8d64cbd2fd12c7248cca648e47ebd63e6462a /views/window/dialog_client_view.cc | |
| parent | cd4857b64f3e3b10ebfa3f44c38af0dc7376d5bb (diff) | |
| download | chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.zip chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.gz chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.bz2 | |
Change Font.GetStringWidth() to take string16 instead of wstring.
do a bunch of string fixes along the way.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/5985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window/dialog_client_view.cc')
| -rw-r--r-- | views/window/dialog_client_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 8ce2224..ad89187 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -447,7 +447,8 @@ int DialogClientView::GetButtonWidth(int button) const { DialogDelegate* dd = GetDialogDelegate(); std::wstring button_label = dd->GetDialogButtonLabel( static_cast<MessageBoxFlags::DialogButton>(button)); - int string_width = dialog_button_font_->GetStringWidth(button_label); + int string_width = dialog_button_font_->GetStringWidth( + WideToUTF16Hack(button_label)); return std::max(string_width + kDialogButtonLabelSpacing, kDialogMinButtonWidth); } |