diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 00:21:51 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 00:21:51 +0000 |
| commit | fee565773acff331a7ef40f0c30d3fb6f05c3c9c (patch) | |
| tree | 6e7f0828e12daaa74885ebac14fac6197462aadd /chrome/browser/chromeos/options/network_config_view.cc | |
| parent | a980002843fab42a1755c16285d3cb06ad6be38b (diff) | |
| download | chromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.zip chromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.tar.gz chromium_src-fee565773acff331a7ef40f0c30d3fb6f05c3c9c.tar.bz2 | |
views: Change DialogDelegate::GetDialogButtonLabel() to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8176012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/options/network_config_view.cc')
| -rw-r--r-- | chrome/browser/chromeos/options/network_config_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index bfe04b5..8639965 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -61,11 +61,11 @@ gfx::NativeWindow NetworkConfigView::GetNativeWindow() const { return GetWidget()->GetNativeWindow(); } -std::wstring NetworkConfigView::GetDialogButtonLabel( - MessageBoxFlags::DialogButton button) const { - if (button == MessageBoxFlags::DIALOGBUTTON_OK) - return UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT)); - return std::wstring(); +string16 NetworkConfigView::GetDialogButtonLabel( + ui::MessageBoxFlags::DialogButton button) const { + if (button == ui::MessageBoxFlags::DIALOGBUTTON_OK) + return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_CONNECT); + return string16(); } bool NetworkConfigView::IsDialogButtonEnabled( |