diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 23:18:30 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 23:18:30 +0000 |
| commit | c18a221971e1fd197cc79f2cc02336c73e6193cf (patch) | |
| tree | 68106cf954659562951f16bd87c6fc6fb114228e /chrome | |
| parent | 4793c9449382bbc28dc9b865b1e77177c9a2feaf (diff) | |
| download | chromium_src-c18a221971e1fd197cc79f2cc02336c73e6193cf.zip chromium_src-c18a221971e1fd197cc79f2cc02336c73e6193cf.tar.gz chromium_src-c18a221971e1fd197cc79f2cc02336c73e6193cf.tar.bz2 | |
DOMUI: Convert the Options page title to 'Settings'
BUG=56151
TEST=out/Debug/chrome --enable-tabbed-options, open the tabbed options, notice
the page title read 'Settings' not 'Chromium/Google Chrome Options.
Review URL: http://codereview.chromium.org/3418021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/core_options_handler.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/options_ui_uitest.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 465e51e..23c3225 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5780,6 +5780,10 @@ Keep your key file in a safe place. You will need it to create new versions of y To hide access to this program, you need to uninstall it by using\n<ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph> in Control Panel.\n\nWould you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph>? </message> + <message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab."> + Settings + </message> + <!-- Options Window --> <if expr="os != 'darwin'"> <message name="IDS_OPTIONS_CHROME_APPS_ENABLE_BACKGROUND_MODE" desc="The label in the checkbox that enables background mode for installed web apps."> diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/core_options_handler.cc index d358956..2739ebc 100644 --- a/chrome/browser/dom_ui/core_options_handler.cc +++ b/chrome/browser/dom_ui/core_options_handler.cc @@ -28,9 +28,7 @@ void CoreOptionsHandler::GetLocalizedValues( DCHECK(localized_strings); // Main localized_strings->SetString("title", - l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); - + l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); localized_strings->SetString("browserPage", l10n_util::GetStringUTF16(IDS_OPTIONS_GENERAL_TAB_LABEL)); localized_strings->SetString("personalPage", diff --git a/chrome/browser/dom_ui/options_ui_uitest.cc b/chrome/browser/dom_ui/options_ui_uitest.cc index 1d08126..d1e8565 100644 --- a/chrome/browser/dom_ui/options_ui_uitest.cc +++ b/chrome/browser/dom_ui/options_ui_uitest.cc @@ -30,9 +30,7 @@ class OptionsUITest : public UITest { void AssertIsOptionsPage(TabProxy* tab) { std::wstring title; ASSERT_TRUE(tab->GetTabTitle(&title)); - string16 expected_title = - l10n_util::GetStringFUTF16(IDS_OPTIONS_DIALOG_TITLE, - l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); + string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE); ASSERT_EQ(expected_title, WideToUTF16Hack(title)); } }; |