web-ui settings: Font setting fixes and improvements....

chrome/browser/ui/webui/options/advanced_options_handler.cc

 // 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/advanced_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 218 matching lines @@
   enable_metrics_recording_.Init(prefs::kMetricsReportingEnabled,
                                  g_browser_process->local_state(), this);
   cloud_print_proxy_email_.Init(prefs::kCloudPrintEmail, prefs, this);
   cloud_print_proxy_enabled_.Init(prefs::kCloudPrintProxyEnabled, prefs, this);
 #endif
   default_download_location_.Init(prefs::kDownloadDefaultDirectory,
                                   prefs, this);
   ask_for_save_location_.Init(prefs::kPromptForDownload, prefs, this);
   auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, 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(web_ui_);
@@ skipping 68 matching lines @@
     } else if (*pref_name == prefs::kDownloadExtensionsToOpen) {
       SetupAutoOpenFileTypesDisabledAttribute();
     } else if (proxy_prefs_->IsObserved(*pref_name)) {
       SetupProxySettingsSection();
     } else if ((*pref_name == prefs::kCloudPrintEmail) ||
                (*pref_name == prefs::kCloudPrintProxyEnabled)) {
 #if !defined(OS_CHROMEOS)
       if (cloud_print_proxy_ui_enabled_)
         SetupCloudPrintProxySection();
 #endif
-    } else if (*pref_name == prefs::kWebKitDefaultFontSize ||
-               *pref_name == prefs::kWebKitDefaultFixedFontSize) {
+    } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
       SetupFontSizeLabel();
     }
   }
 }
 
 void AdvancedOptionsHandler::HandleSelectDownloadLocation(
     const ListValue* args) {
   PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
   select_folder_dialog_ = SelectFileDialog::Create(this);
   select_folder_dialog_->SelectFile(
@@ skipping 44 matching lines @@
   enable_metrics_recording_.SetValue(is_enabled);
   SetupMetricsReportingCheckbox();
 #endif
 }
 
 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";
@@ skipping 146 matching lines @@
     FundamentalValue visible(false);
     web_ui_->CallJavascriptFunction(
         "options.AdvancedOptions.SetMetricsReportingSettingVisibility",
         visible);
   }
 #endif
 }
 
 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());
   web_ui_->CallJavascriptFunction(
-      "options.AdvancedOptions.SetFontSize", fixed_font_size, font_size);
+      "options.AdvancedOptions.SetFontSize", font_size);
 }
 
 void AdvancedOptionsHandler::SetupDownloadLocationPath() {
   StringValue value(default_download_location_.GetValue().value());
   FundamentalValue disabled(default_download_location_.IsManaged());
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetDownloadLocationPath", value, disabled);
 }
 
 void AdvancedOptionsHandler::SetupPromptForDownload() {
@@ skipping 62 matching lines @@
   FundamentalValue useSSL3Value(useSSL3Setting);
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetUseSSL3CheckboxState",
       useSSL3Value, disabledValue);
   FundamentalValue useTLS1Value(useTLS1Setting);
   web_ui_->CallJavascriptFunction(
       "options.AdvancedOptions.SetUseTLS1CheckboxState",
       useTLS1Value, disabledValue);
 }
 #endif