diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 02:47:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 02:47:18 +0000 |
| commit | b3d75b91d5160d03e5e58ea430cfc5f33f2eee32 (patch) | |
| tree | a41ed523cea220fdbacdfdfa9af4962b2d4479be | |
| parent | 74101259c1f4358fe37f54921bd39ce9ec604bd8 (diff) | |
| download | chromium_src-b3d75b91d5160d03e5e58ea430cfc5f33f2eee32.zip chromium_src-b3d75b91d5160d03e5e58ea430cfc5f33f2eee32.tar.gz chromium_src-b3d75b91d5160d03e5e58ea430cfc5f33f2eee32.tar.bz2 | |
chromeos: DOMUI/Network: Change the button label to 'Cancel' instead of 'Done'.
BUG=chromium-os:7174
TEST=see bug
Review URL: http://codereview.chromium.org/3529011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61470 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/browser/chromeos/dom_ui/internet_options_handler.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/options/network_config_view.cc | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 2a7506b..b2c4624 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8712,9 +8712,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CUSTOMER_SUPPORT" desc="In settings internet options, the text for customer support hyper link."> Customer support </message> - <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE" desc="In settings internet options, the label for the button done."> - Done - </message> <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN" desc="In settings internet options, the label for the button login."> Login </message> diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index d71c838..25dea64 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -123,11 +123,8 @@ void InternetOptionsHandler::GetLocalizedValues( localized_strings->SetString("inetConnect", l10n_util::GetStringUTF16( IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CONNECT_TITLE)); - - localized_strings->SetString("detailsInternetDismiss", - l10n_util::GetStringUTF16( - IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE)); + l10n_util::GetStringUTF16(IDS_CANCEL)); localized_strings->Set("wiredList", GetWiredList()); localized_strings->Set("wirelessList", GetWirelessList()); diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index d18006e..17e9eb7 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -75,9 +75,9 @@ std::wstring NetworkConfigView::GetDialogButtonLabel( if (flags_ & FLAG_LOGIN_ONLY) return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_LOGIN); else - return l10n_util::GetString(IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE); + return l10n_util::GetString(IDS_CANCEL); } - return L""; + return std::wstring(); } bool NetworkConfigView::IsDialogButtonEnabled( |