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

chrome/browser/ui/webui/options/font_settings_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/font_settings_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
@@ skipping 21 matching lines @@
     fonts_list_loader_->SetObserver(NULL);
 }
 
 void FontSettingsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   static OptionsStringResource resources[] = {
     { "fontSettingsStandard",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_STANDARD_LABEL },
+    { "fontSettingsSerif",
+      IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL },
+    { "fontSettingsSansSerif",
+      IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL },
     { "fontSettingsFixedWidth",
       IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL },
     { "fontSettingsMinimumSize",
       IDS_FONT_LANGUAGE_SETTING_MINIMUM_FONT_SIZE_TITLE },
     { "fontSettingsEncoding",
       IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE },
     { "fontSettingsSizeLabel",
       IDS_FONT_LANGUAGE_SETTING_FONT_SIZE_SELECTOR_LABEL },
     { "fontSettingsSizeTiny",
       IDS_FONT_LANGUAGE_SETTING_FONT_SIZE_TINY },
     { "fontSettingsSizeHuge",
       IDS_FONT_LANGUAGE_SETTING_FONT_SIZE_HUGE },
     { "fontSettingsEncodingLabel",
       IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL },
     { "fontSettingsLoremIpsum",
       IDS_FONT_LANGUAGE_SETTING_LOREM_IPSUM },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "fontSettingsPage",
                 IDS_FONT_LANGUAGE_SETTING_FONT_TAB_TITLE);
   localized_strings->SetString("fontSettingsPlaceholder",
       l10n_util::GetStringUTF16(
           IDS_FONT_LANGUAGE_SETTING_PLACEHOLDER));
 }
 
 void FontSettingsHandler::Initialize() {
   DCHECK(web_ui_);
   SetupStandardFontSample();
+  SetupSerifFontSample();
+  SetupSansSerifFontSample();
+  SetupFixedFontSample();
   SetupMinimumFontSample();
-  SetupFixedFontSample();
 }
 
 WebUIMessageHandler* FontSettingsHandler::Attach(WebUI* web_ui) {
   // Call through to superclass.
   WebUIMessageHandler* handler = OptionsPageUIHandler::Attach(web_ui);
 
   // Perform validation for saved fonts.
   DCHECK(web_ui_);
   PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
   FontSettingsUtilities::ValidateSavedFonts(pref_service);
 
   // Register for preferences that we need to observe manually.
   standard_font_.Init(prefs::kWebKitStandardFontFamily, pref_service, this);
+  serif_font_.Init(prefs::kWebKitSerifFontFamily, pref_service, this);
+  sans_serif_font_.Init(prefs::kWebKitSansSerifFontFamily, pref_service, this);
   fixed_font_.Init(prefs::kWebKitFixedFontFamily, pref_service, this);
   font_encoding_.Init(prefs::kDefaultCharset, pref_service, this);
   default_font_size_.Init(prefs::kWebKitDefaultFontSize, pref_service, this);
   default_fixed_font_size_.Init(prefs::kWebKitDefaultFixedFontSize,
                                 pref_service, this);
   minimum_font_size_.Init(prefs::kWebKitMinimumFontSize, pref_service, this);
 
   // Return result from the superclass.
   return handler;
 }
@@ skipping 34 matching lines @@
     } else {
       // Add empty name/value to indicate a separator item.
       option->Append(Value::CreateStringValue(""));
       option->Append(Value::CreateStringValue(""));
     }
     encoding_list.Append(option);
   }
 
   ListValue selected_values;
   selected_values.Append(Value::CreateStringValue(standard_font_.GetValue()));
+  selected_values.Append(Value::CreateStringValue(serif_font_.GetValue()));
+  selected_values.Append(Value::CreateStringValue(sans_serif_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(fixed_font_.GetValue()));
   selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
 
   web_ui_->CallJavascriptFunction("FontSettings.setFontsData",
                                   *fonts_list, encoding_list, selected_values);
 }
 
 void FontSettingsHandler::Observe(NotificationType type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED) {
     std::string* pref_name = Details<std::string>(details).ptr();
-    if (*pref_name == prefs::kWebKitStandardFontFamily ||
-        *pref_name == prefs::kWebKitDefaultFontSize) {
+    if (*pref_name == prefs::kWebKitStandardFontFamily) {
       SetupStandardFontSample();
+    } else if (*pref_name == prefs::kWebKitSerifFontFamily) {
+      SetupSerifFontSample();
+    } else if (*pref_name == prefs::kWebKitSansSerifFontFamily) {
+      SetupSansSerifFontSample();
     } else if (*pref_name == prefs::kWebKitFixedFontFamily ||
                *pref_name == prefs::kWebKitDefaultFixedFontSize) {
       SetupFixedFontSample();
+    } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
+      SetupStandardFontSample();
+      SetupSerifFontSample();
+      SetupSansSerifFontSample();
     } else if (*pref_name == prefs::kWebKitMinimumFontSize) {
       SetupMinimumFontSample();
     }
   }
 }
 
 void FontSettingsHandler::SetupStandardFontSample() {
   StringValue font_value(standard_font_.GetValue());
   FundamentalValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setupStandardFontSample", font_value, size_value);
 }
 
+void FontSettingsHandler::SetupSerifFontSample() {
+  StringValue font_value(serif_font_.GetValue());
+  FundamentalValue size_value(default_font_size_.GetValue());
+  web_ui_->CallJavascriptFunction(
+      "FontSettings.setupSerifFontSample", font_value, size_value);
+}
+
+void FontSettingsHandler::SetupSansSerifFontSample() {
+  StringValue font_value(sans_serif_font_.GetValue());
+  FundamentalValue size_value(default_font_size_.GetValue());
+  web_ui_->CallJavascriptFunction(
+      "FontSettings.setupSansSerifFontSample", font_value, size_value);
+}
+
 void FontSettingsHandler::SetupFixedFontSample() {
   StringValue font_value(fixed_font_.GetValue());
   FundamentalValue size_value(default_fixed_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setupFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetupMinimumFontSample() {
   FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui_->CallJavascriptFunction("FontSettings.setupMinimumFontSample",
                                   size_value);
 }