DOMUI: Temporarily strip trailing colons from section titles until the strings

chrome/browser/dom_ui/options/browser_options_handler.cc

 // Copyright (c) 2010 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/dom_ui/options/browser_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
+#include "chrome/browser/dom_ui/options/dom_options_util.h"
 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/ui/options/options_window.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 11 matching lines @@
   if (default_browser_worker_.get())
     default_browser_worker_->ObserverDestroyed();
   if (template_url_model_)
     template_url_model_->RemoveObserver(this);
 }
 
 void BrowserOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   localized_strings->SetString("startupGroupName",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_GROUP_NAME));
+      dom_options_util::StripColon(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_GROUP_NAME)));
   localized_strings->SetString("startupShowDefaultAndNewTab",
       l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB));
   localized_strings->SetString("startupShowLastSession",
       l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION));
   localized_strings->SetString("startupShowPages",
       l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_SHOW_PAGES));
   localized_strings->SetString("startupShowManyPages",
       l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_SHOW_MANY_PAGES));
   localized_strings->SetString("startupUseCurrent",
       l10n_util::GetStringUTF16(IDS_OPTIONS_STARTUP_USE_CURRENT));
   localized_strings->SetString("homepageGroupName",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_HOMEPAGE_GROUP_NAME));
+      dom_options_util::StripColon(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_HOMEPAGE_GROUP_NAME)));
   localized_strings->SetString("homepageUseNewTab",
       l10n_util::GetStringUTF16(IDS_OPTIONS_HOMEPAGE_USE_NEWTAB));
   localized_strings->SetString("homepageUseURL",
       l10n_util::GetStringUTF16(IDS_OPTIONS_HOMEPAGE_USE_URL));
   localized_strings->SetString("toolbarGroupName",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_TOOLBAR_GROUP_NAME));
+      dom_options_util::StripColon(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_TOOLBAR_GROUP_NAME)));
   localized_strings->SetString("toolbarShowHomeButton",
       l10n_util::GetStringUTF16(IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON));
   localized_strings->SetString("defaultSearchGroupName",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME));
+      dom_options_util::StripColon(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME)));
   localized_strings->SetString("defaultSearchManageEngines",
       l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTSEARCH_MANAGE_ENGINES));
   localized_strings->SetString("instantName",
       l10n_util::GetStringUTF16(IDS_INSTANT_PREF));
   localized_strings->SetString("instantWarningText",
       l10n_util::GetStringUTF16(IDS_INSTANT_PREF_WARNING));
   localized_strings->SetString("instantLearnMoreLink",
       ASCIIToUTF16(browser::InstantLearnMoreURL().spec()));
   localized_strings->SetString("instantConfirmTitle",
       l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_TITLE));
   localized_strings->SetString("instantConfirmMessage",
       l10n_util::GetStringUTF16(IDS_INSTANT_OPT_IN_MESSAGE));
   localized_strings->SetString("defaultBrowserGroupName",
-      l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME));
+      dom_options_util::StripColon(
+          l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME)));
   localized_strings->SetString("defaultBrowserUnknown",
       l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   localized_strings->SetString("defaultBrowserUseAsDefault",
       l10n_util::GetStringFUTF16(IDS_OPTIONS_DEFAULTBROWSER_USEASDEFAULT,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 }
 
 void BrowserOptionsHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback(
@@ skipping 254 matching lines @@
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }