DOMUI Settings: UTH: Fix up the 'Web Content' section.

chrome/browser/dom_ui/options/advanced_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/advanced_options_handler.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 104 matching lines @@
   localized_strings->SetString("linkDoctorPref",
       l10n_util::GetStringUTF16(IDS_OPTIONS_LINKDOCTOR_PREF));
   localized_strings->SetString("suggestPref",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SUGGEST_PREF));
   localized_strings->SetString("tabsToLinksPref",
       l10n_util::GetStringUTF16(IDS_OPTIONS_TABS_TO_LINKS_PREF));
   localized_strings->SetString("fontSettingsInfo",
       l10n_util::GetStringUTF16(IDS_OPTIONS_FONTSETTINGS_INFO));
   localized_strings->SetString("defaultZoomLevelLabel",
       l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL));
+  localized_strings->SetString("defaultFontSizeLabel",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULT_FONT_SIZE_LABEL));
+  localized_strings->SetString("fontSizeLabelVerySmall",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL));
+  localized_strings->SetString("fontSizeLabelSmall",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_SMALL));
+  localized_strings->SetString("fontSizeLabelMedium",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM));
+  localized_strings->SetString("fontSizeLabelLarge",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_LARGE));
+  localized_strings->SetString("fontSizeLabelVeryLarge",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE));
+  localized_strings->SetString("fontSizeLabelCustom",
+      l10n_util::GetStringUTF16(IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM));
   localized_strings->SetString("fontSettingsCustomizeFontsButton",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON));
   localized_strings->SetString("advancedSectionTitlePrivacy",
       dom_options_util::StripColon(
           l10n_util::GetStringUTF16(
               IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)));
   localized_strings->SetString("advancedSectionTitleContent",
       dom_options_util::StripColon(
           l10n_util::GetStringUTF16(
@@ skipping 38 matching lines @@
       l10n_util::GetStringUTF16(IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE));
   localized_strings->SetString("disableWebServices",
       l10n_util::GetStringUTF16(IDS_OPTIONS_DISABLE_WEB_SERVICES));
 }
 
 void AdvancedOptionsHandler::Initialize() {
   DCHECK(dom_ui_);
   SetupMetricsReportingCheckbox();
   SetupMetricsReportingSettingVisibility();
   SetupDefaultZoomLevel();
+  SetupFontSizeLabel();
   SetupDownloadLocationPath();
   SetupAutoOpenFileTypesDisabledAttribute();
   SetupProxySettingsSection();
 #if defined(OS_WIN)
   SetupSSLConfigSettings();
 #endif
 #if !defined(OS_CHROMEOS)
   if (cloud_print_proxy_ui_enabled_) {
     SetupCloudPrintProxySection();
     RefreshCloudPrintStatusFromService();
@@ skipping 15 matching lines @@
   PrefService* prefs = dom_ui_->GetProfile()->GetPrefs();
 #if !defined(OS_CHROMEOS)
   enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled,
                                  g_browser_process->local_state(), this);
   cloud_print_proxy_email_.Init(prefs::kCloudPrintEmail, prefs, this);
 #endif
   default_download_location_.Init(prefs::kDownloadDefaultDirectory,
                                   prefs, this);
   auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
   default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
+  default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this);
+  default_fixed_font_size_.Init(prefs::kWebKitDefaultFixedFontSize, prefs,
+                                this);
   proxy_prefs_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
 
   // Return result from the superclass.
   return handler;
 }
 
 void AdvancedOptionsHandler::RegisterMessages() {
   // Setup handlers specific to this panel.
   DCHECK(dom_ui_);
   dom_ui_->RegisterMessageCallback("selectDownloadLocation",
       NewCallback(this,
                   &AdvancedOptionsHandler::HandleSelectDownloadLocation));
   dom_ui_->RegisterMessageCallback("autoOpenFileTypesAction",
       NewCallback(this,
                   &AdvancedOptionsHandler::HandleAutoOpenButton));
   dom_ui_->RegisterMessageCallback("defaultZoomLevelAction",
       NewCallback(this, &AdvancedOptionsHandler::HandleDefaultZoomLevel));
+  dom_ui_->RegisterMessageCallback("defaultFontSizeAction",
+      NewCallback(this, &AdvancedOptionsHandler::HandleDefaultFontSize));
 #if !defined(OS_CHROMEOS)
   dom_ui_->RegisterMessageCallback("metricsReportingCheckboxAction",
       NewCallback(this,
                   &AdvancedOptionsHandler::HandleMetricsReportingCheckbox));
 #endif
 #if !defined(USE_NSS) && !defined(USE_OPENSSL)
   dom_ui_->RegisterMessageCallback("showManageSSLCertificates",
       NewCallback(this,
                   &AdvancedOptionsHandler::ShowManageSSLCertificates));
 #endif
@@ skipping 40 matching lines @@
       SetupDownloadLocationPath();
     } else if (*pref_name == prefs::kDownloadExtensionsToOpen) {
       SetupAutoOpenFileTypesDisabledAttribute();
     } else if (proxy_prefs_->IsObserved(*pref_name)) {
       SetupProxySettingsSection();
     } else if (*pref_name == prefs::kCloudPrintEmail) {
 #if !defined(OS_CHROMEOS)
       if (cloud_print_proxy_ui_enabled_)
         SetupCloudPrintProxySection();
 #endif
+    } else if (*pref_name == prefs::kWebKitDefaultFontSize ||
+               *pref_name == prefs::kWebKitDefaultFixedFontSize) {
+      SetupFontSizeLabel();
     }
   }
 }
 
 void AdvancedOptionsHandler::HandleSelectDownloadLocation(
     const ListValue* args) {
   PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
   select_folder_dialog_ = SelectFileDialog::Create(this);
   select_folder_dialog_->SelectFile(
       SelectFileDialog::SELECT_FOLDER,
@@ skipping 40 matching lines @@
 }
 
 void AdvancedOptionsHandler::HandleDefaultZoomLevel(const ListValue* args) {
   UserMetricsRecordAction(UserMetricsAction("Options_ChangeDefaultZoomLevel"));
   int zoom_level;
   if (ExtractIntegerValue(args, &zoom_level)) {
     default_zoom_level_.SetValue(static_cast<double>(zoom_level));
   }
 }
 
+void AdvancedOptionsHandler::HandleDefaultFontSize(const ListValue* args) {
+  int font_size;
+  if (ExtractIntegerValue(args, &font_size)) {
+    if (font_size > 0) {
+      default_font_size_.SetValue(font_size);
+      default_fixed_font_size_.SetValue(font_size);
+      SetupFontSizeLabel();
+    }
+  }
+}
+
 #if defined(OS_WIN)
 void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
     const ListValue* args) {
   std::string checked_str = WideToUTF8(ExtractStringValue(args));
   bool enabled = (checked_str == "true");
   std::string metric =
       (enabled ? "Options_CheckCertRevocation_Enable"
                : "Options_CheckCertRevocation_Disable");
   UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
   net::SSLConfigServiceWin::SetRevCheckingEnabled(enabled);
@@ skipping 119 matching lines @@
 #endif
 }
 
 void AdvancedOptionsHandler::SetupDefaultZoomLevel() {
   // We're only interested in integer values, so convert to int.
   FundamentalValue value(static_cast<int>(default_zoom_level_.GetValue()));
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetDefaultZoomLevel", value);
 }
 
+void AdvancedOptionsHandler::SetupFontSizeLabel() {
+  // We're only interested in integer values, so convert to int.
+  FundamentalValue fixed_font_size(default_fixed_font_size_.GetValue());
+  FundamentalValue font_size(default_font_size_.GetValue());
+  dom_ui_->CallJavascriptFunction(
+      L"options.AdvancedOptions.SetFontSize", fixed_font_size,
+      font_size);
+}
+
 void AdvancedOptionsHandler::SetupDownloadLocationPath() {
   StringValue value(default_download_location_.GetValue().value());
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetDownloadLocationPath", value);
 }
 
 void AdvancedOptionsHandler::SetupAutoOpenFileTypesDisabledAttribute() {
   // Set the enabled state for the AutoOpenFileTypesResetToDefault button.
   // We enable the button if the user has any auto-open file types registered.
   DownloadManager* manager = dom_ui_->GetProfile()->GetDownloadManager();
@@ skipping 52 matching lines @@
   FundamentalValue useSSL3Value(useSSL3Setting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseSSL3CheckboxState",
       useSSL3Value, disabledValue);
   FundamentalValue useTLS1Value(useTLS1Setting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseTLS1CheckboxState",
       useTLS1Value, disabledValue);
 }
 #endif