diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 127 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/advanced_options_handler.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/browser_options_handler.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/dom_options_util.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/dom_options_util.h | 21 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/font_settings_handler.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/options_ui.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/options_ui.h | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/personal_options_handler.cc | 19 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 |
10 files changed, 82 insertions, 132 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4d885a0..9229da0 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6863,17 +6863,13 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> - <!-- Views displays group titles and their contents side-by-side --> - <!-- and includes a colon as a result (Mac needs this too). GTK --> - <!-- uses title case and displays the titles above the contents, --> - <!-- so we omit the colon. --> - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_STARTUP_GROUP_NAME" desc="The title of the startup group"> - On startup: + On startup </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_OPTIONS_STARTUP_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the startup group"> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_STARTUP_GROUP_NAME" desc="In Title Case: The title of the startup group"> On Startup </message> </if> @@ -6925,19 +6921,21 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> - <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group"> - Toolbar - </message> - - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="The title of the home pages group"> - Home page: + Home page + </message> + <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group"> + Toolbar </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the home pages group"> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_HOMEPAGE_GROUP_NAME" desc="In Title Case: The title of the home pages group"> Home Page </message> + <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="In Title Case: The title of the toolbar group"> + Toolbar + </message> </if> <message name="IDS_OPTIONS_HOMEPAGE_USE_NEWTAB" desc="The title of the 'Use the New Tab page' for the home page radio"> Use the New Tab page @@ -6962,20 +6960,13 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> - <if expr="os == 'darwin'"> - <!-- Mac has a Toolbar group (IDS_OPTIONS_HOMEPAGE_SHOW_BUTTON moved in this group) --> - <message name="IDS_OPTIONS_TOOLBAR_GROUP_NAME" desc="The title of the toolbar group"> - Toolbar: - </message> - </if> - - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="The title of the default search engine group"> - Search: + Search </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default search engine group"> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME" desc="In Title Case: The title of the default search engine group"> Search </message> </if> @@ -6994,13 +6985,13 @@ Keep your key file in a safe place. You will need it to create new versions of y URL with %s in place of query </message> - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="The title of the default browser group"> - Default browser: + Default browser </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the default browser group"> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME" desc="In Title Case: The title of the default browser group"> Default Browser </message> </if> @@ -7021,16 +7012,19 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT" desc="In Title Case: The label of the 'Use Chrome as default' browser button"> Make <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> My Default Browser </message> + <message name="IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME" desc="The title of the download location group"> + Downloads + </message> </if> <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT" desc="In sentence case: The label of the 'Use Chrome as default' browser button"> Make <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> my default browser </message> + <message name="IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME" desc="In Title Case: The title of the download location group"> + Downloads + </message> </if> - <message name="IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME" desc="The title of the download location group"> - Downloads - </message> <!-- TODO(tfarina): Remove this message when the platform-specific dialogs are removed. --> <message name="IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_BUTTON" desc="The label of the 'Browse...' button"> Br&owse... @@ -7097,19 +7091,19 @@ Keep your key file in a safe place. You will need it to create new versions of y Manage saved passwords... </message> </if> - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME" desc="The title of the form Autofill group"> - Form autofill: + Form autofill </message> <message name="IDS_OPTIONS_PASSWORDS_GROUP_NAME" desc="The title of the 'Passwords' group"> - Passwords: + Passwords </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the form Autofill group"> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME" desc="In Title Case: The title of the form Autofill group"> Form Autofill </message> - <message name="IDS_OPTIONS_PASSWORDS_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the 'Passwords' group"> + <message name="IDS_OPTIONS_PASSWORDS_GROUP_NAME" desc="In Title Case: The title of the 'Passwords' group"> Passwords </message> </if> @@ -7205,17 +7199,18 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_AUTOFILL_USE_MAC_ADDRESS_BOOK" desc="Checkbox label to enable Address Book on Mac."> Include addresses from my Address Book card </message> - <message name="IDS_AUTOFILL_ADDRESSES_GROUP_NAME" desc="The name of the Addresses group of the Autofill dialog."> - Addresses - </message> - <message name="IDS_AUTOFILL_CREDITCARDS_GROUP_NAME" desc="The name of the Credit Cards group of the Autofill dialog."> - Credit Cards - </message> + <message name="IDS_AUTOFILL_EDIT_BUTTON" desc="Text of the edit button in the Autofill editor"> Edit... </message> <if expr="not pp_ifdef('use_titlecase')"> + <message name="IDS_AUTOFILL_ADDRESSES_GROUP_NAME" desc="In sentence case: The name of the Addresses group of the Autofill dialog."> + Addresses + </message> + <message name="IDS_AUTOFILL_CREDITCARDS_GROUP_NAME" desc="In sentence case: The name of the Credit Cards group of the Autofill dialog."> + Credit cards + </message> <message name="IDS_AUTOFILL_EDIT_ADDRESS_CAPTION" desc="In sentence case: The caption on the edit Autofill address dialog."> Edit address </message> @@ -7230,6 +7225,12 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_AUTOFILL_ADDRESSES_GROUP_NAME" desc="In Title Case: The name of the Addresses group of the Autofill dialog."> + Addresses + </message> + <message name="IDS_AUTOFILL_CREDITCARDS_GROUP_NAME" desc="In Title Case: The name of the Credit Cards group of the Autofill dialog."> + Credit Cards + </message> <message name="IDS_AUTOFILL_EDIT_ADDRESS_CAPTION" desc="In Title Case: The caption on the edit Autofill address dialog."> Edit Address </message> @@ -7347,11 +7348,19 @@ Keep your key file in a safe place. You will need it to create new versions of y About Autofill </message> - <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> - Themes: - </message> + <if expr="not pp_ifdef('use_titlecase')"> + <message name="IDS_THEMES_GROUP_NAME" desc="In sentence case: The title of the themes group"> + Themes + </message> + </if> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_THEMES_GROUP_NAME" desc="In Title Case: The title of the themes group"> + Themes + </message> + </if> + <if expr="os == 'linux2' or os.find('bsd') != -1"> - <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the themes group"> + <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case: The title of the themes group"> Appearance </message> <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> @@ -7418,13 +7427,13 @@ Keep your key file in a safe place. You will need it to create new versions of y Use TLS 1.0 </message> - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="The title of the 'Browsing data' group."> - Browsing data: + Browsing data </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the 'Browsing data' group."> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_OPTIONS_BROWSING_DATA_GROUP_NAME" desc="In Title Case: The title of the 'Browsing data' group."> Browsing Data </message> </if> @@ -8425,13 +8434,13 @@ Keep your key file in a safe place. You will need it to create new versions of y <!-- Sync strings --> <!-- Sync options dialog strings --> - <if expr="not pp_ifdef('use_titlecase') or os != 'linux2'"> + <if expr="not pp_ifdef('use_titlecase')"> <message name="IDS_SYNC_OPTIONS_GROUP_NAME" desc="The name of the sync group in the options dialog."> - Sync: + Sync </message> </if> - <if expr="pp_ifdef('use_titlecase') and os == 'linux2'"> - <message name="IDS_SYNC_OPTIONS_GROUP_NAME" desc="In Title Case and without trailing colon: The name of the sync group in the options dialog."> + <if expr="pp_ifdef('use_titlecase')"> + <message name="IDS_SYNC_OPTIONS_GROUP_NAME" desc="In Title Case: The name of the sync group in the options dialog."> Sync </message> </if> @@ -9715,7 +9724,7 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_ACCOUNTS_OWNER_ONLY" desc="In the Accounts settings tab, the warning text noticing that only the owner can modify these settings."> These settings may only be modified by the owner: </message> - <message name="IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME" desc="In the Personal Stuff settings tab, the title text for Account section."> + <message name="IDS_OPTIONS_PERSONAL_ACCOUNT_GROUP_NAME" desc="In sentence case: In the Personal Stuff settings tab, the title text for Account section."> Account </message> <message name="IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX" desc="In the Personal Stuff settings tab, the text on the checkbox to enable screenlocker for current user."> diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index c0c36cf..3d71dfc 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -25,7 +25,6 @@ #include "chrome/browser/service/service_process_control_manager.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/browser/ui/options/options_window.h" -#include "chrome/browser/ui/webui/options/dom_options_util.h" #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index f2ac21a..d407f06 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -22,7 +22,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/webui/favicon_source.h" -#include "chrome/browser/ui/webui/options/dom_options_util.h" #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/browser_distribution.h" @@ -50,25 +49,25 @@ void BrowserOptionsHandler::GetLocalizedValues( DCHECK(localized_strings); static OptionsStringResource resources[] = { - { "startupGroupName", IDS_OPTIONS_STARTUP_GROUP_NAME, true }, + { "startupGroupName", IDS_OPTIONS_STARTUP_GROUP_NAME }, { "startupShowDefaultAndNewTab", IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB}, { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION }, { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, { "startupAddButton", IDS_OPTIONS_STARTUP_ADD_BUTTON }, { "startupUseCurrent", IDS_OPTIONS_STARTUP_USE_CURRENT }, - { "homepageGroupName", IDS_OPTIONS_HOMEPAGE_GROUP_NAME, true }, + { "homepageGroupName", IDS_OPTIONS_HOMEPAGE_GROUP_NAME }, { "homepageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB }, { "homepageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL }, - { "toolbarGroupName", IDS_OPTIONS_TOOLBAR_GROUP_NAME, true }, + { "toolbarGroupName", IDS_OPTIONS_TOOLBAR_GROUP_NAME }, { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, - { "defaultSearchGroupName", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME, true }, + { "defaultSearchGroupName", IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME }, { "defaultSearchManageEngines", IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES }, { "instantName", IDS_INSTANT_PREF }, { "instantWarningText", IDS_INSTANT_PREF_WARNING }, { "instantConfirmTitle", IDS_INSTANT_OPT_IN_TITLE }, { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE }, - { "defaultBrowserGroupName", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME, true }, + { "defaultBrowserGroupName", IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME }, }; RegisterStrings(localized_strings, resources, arraysize(resources)); diff --git a/chrome/browser/ui/webui/options/dom_options_util.cc b/chrome/browser/ui/webui/options/dom_options_util.cc deleted file mode 100644 index 91a272d..0000000 --- a/chrome/browser/ui/webui/options/dom_options_util.cc +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/webui/options/dom_options_util.h" - -#include "base/string_util.h" - -namespace dom_options_util { - -// TODO(estade): update all strings that have a trailing colon once we get rid -// of the native dialogs. -string16 StripColon(const string16& str) { - const string16::value_type kColon[] = { ':', 0 }; - string16 result; - TrimString(str, kColon, &result); - return result; -} - -} // namespace dom_options_util diff --git a/chrome/browser/ui/webui/options/dom_options_util.h b/chrome/browser/ui/webui/options/dom_options_util.h deleted file mode 100644 index 9c3b41f..0000000 --- a/chrome/browser/ui/webui/options/dom_options_util.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_ -#define CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_ -#pragma once - -#include "base/string16.h" - -namespace dom_options_util { - -// Strips the trailing colon from a string. Used to remove the colon from -// section titles on platforms that append it. -// TODO(jhawkins): Remove this once the platform-specific options dialogs are -// removed. -string16 StripColon(const string16& str); - -} // namespace options_util - -#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_DOM_OPTIONS_UTIL_H_ diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 707a0cfd..24c00e6 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -15,7 +15,6 @@ #include "chrome/browser/character_encoding.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/webui/options/dom_options_util.h" #include "chrome/browser/ui/webui/options/font_settings_utils.h" #include "chrome/common/pref_names.h" #include "content/common/notification_details.h" @@ -39,9 +38,9 @@ void FontSettingsHandler::GetLocalizedValues( static OptionsStringResource resources[] = { { "fontSettingsStandard", - IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_STANDARD_LABEL, true }, + IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_STANDARD_LABEL }, { "fontSettingsFixedWidth", - IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL, true }, + IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL }, { "fontSettingsMinimumSize", IDS_FONT_LANGUAGE_SETTING_MINIMUM_FONT_SIZE_TITLE }, { "fontSettingsEncoding", diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 1277fce..7a08529 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -28,7 +28,6 @@ #include "chrome/browser/ui/webui/options/content_settings_handler.h" #include "chrome/browser/ui/webui/options/cookies_view_handler.h" #include "chrome/browser/ui/webui/options/core_options_handler.h" -#include "chrome/browser/ui/webui/options/dom_options_util.h" #include "chrome/browser/ui/webui/options/font_settings_handler.h" #include "chrome/browser/ui/webui/options/import_data_handler.h" #include "chrome/browser/ui/webui/options/language_options_handler.h" @@ -136,10 +135,8 @@ void OptionsPageUIHandler::RegisterStrings( const OptionsStringResource* resources, size_t length) { for (size_t i = 0; i < length; ++i) { - const string16& value = l10n_util::GetStringUTF16(resources[i].id); localized_strings->SetString( - resources[i].name, - resources[i].strip_colon ? dom_options_util::StripColon(value) : value); + resources[i].name, l10n_util::GetStringUTF16(resources[i].id)); } } diff --git a/chrome/browser/ui/webui/options/options_ui.h b/chrome/browser/ui/webui/options/options_ui.h index be59e33..76c0d70 100644 --- a/chrome/browser/ui/webui/options/options_ui.h +++ b/chrome/browser/ui/webui/options/options_ui.h @@ -75,9 +75,6 @@ class OptionsPageUIHandler : public WebUIMessageHandler, const char* name; // The .grd ID for the resource (IDS_*). int id; - // True if the trailing colon should be stripped on platforms that - // don't want trailing colons. - bool strip_colon; }; // A helper for simplifying the process of registering strings in WebUI. static void RegisterStrings(DictionaryValue* localized_strings, diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 5619978..a665d17 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -22,7 +22,6 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/options/options_page_base.h" #include "chrome/browser/ui/options/options_window.h" -#include "chrome/browser/ui/webui/options/dom_options_util.h" #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/net/gaia/google_service_auth_error.h" @@ -70,16 +69,14 @@ void PersonalOptionsHandler::GetLocalizedValues( IDS_OPTIONS_CONTENT_TAB_LABEL); localized_strings->SetString("syncSection", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_SYNC_OPTIONS_GROUP_NAME)); localized_strings->SetString("customizeSync", l10n_util::GetStringUTF16(IDS_SYNC_CUSTOMIZE_BUTTON_LABEL)); localized_strings->SetString("privacyDashboardLink", l10n_util::GetStringUTF16(IDS_SYNC_PRIVACY_DASHBOARD_LINK_LABEL)); localized_strings->SetString("passwords", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_GROUP_NAME)); localized_strings->SetString("passwordsAskToSave", l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_ASKTOSAVE)); localized_strings->SetString("passwordsNeverSave", @@ -88,16 +85,14 @@ void PersonalOptionsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS)); localized_strings->SetString("autofill", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_AUTOFILL_SETTING_WINDOWS_GROUP_NAME)); localized_strings->SetString("autoFillEnabled", l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOFILL_ENABLE)); localized_strings->SetString("manageAutofillSettings", l10n_util::GetStringUTF16(IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS)); localized_strings->SetString("browsingData", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_OPTIONS_BROWSING_DATA_GROUP_NAME)); localized_strings->SetString("importData", l10n_util::GetStringUTF16(IDS_OPTIONS_IMPORT_DATA_BUTTON)); @@ -108,8 +103,7 @@ void PersonalOptionsHandler::GetLocalizedValues( #if defined(TOOLKIT_GTK) localized_strings->SetString("appearance", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_APPEARANCE_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_APPEARANCE_GROUP_NAME)); localized_strings->SetString("themesGTKButton", l10n_util::GetStringUTF16(IDS_THEMES_GTK_BUTTON)); localized_strings->SetString("themesSetClassic", @@ -120,8 +114,7 @@ void PersonalOptionsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_HIDE_WINDOW_DECORATIONS_RADIO)); #else localized_strings->SetString("themes", - dom_options_util::StripColon( - l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME))); + l10n_util::GetStringUTF16(IDS_THEMES_GROUP_NAME)); localized_strings->SetString("themesReset", l10n_util::GetStringUTF16(IDS_THEMES_RESET_BUTTON)); #endif diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ec72d6f..7ce9608 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3196,8 +3196,6 @@ 'browser/ui/webui/options/cookies_view_handler.h', 'browser/ui/webui/options/core_options_handler.cc', 'browser/ui/webui/options/core_options_handler.h', - 'browser/ui/webui/options/dom_options_util.cc', - 'browser/ui/webui/options/dom_options_util.h', 'browser/ui/webui/options/font_settings_fonts_list_loader.cc', 'browser/ui/webui/options/font_settings_fonts_list_loader.h', 'browser/ui/webui/options/font_settings_handler.cc', |