web-ui settings: Standard font setting now correlates to WebKit's standard fo...

chrome/browser/resources/options/font_settings.js

 // 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.
 
 cr.define('options', function() {
 
   var OptionsPage = options.OptionsPage;
 
   /**
    * FontSettings class
@@ skipping 11 matching lines @@
 
   FontSettings.prototype = {
     __proto__: OptionsPage.prototype,
 
     /**
      * Initialize the page.
      */
     initializePage: function() {
       OptionsPage.prototype.initializePage.call(this);
 
-      var serifFontRange = $('serif-font-size');
-      serifFontRange.valueMap = $('fixed-font-size').valueMap = [9, 10, 11, 12,
-          13, 14, 15, 16, 17, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 40, 44,
-          48, 56, 64, 72];
-      serifFontRange.continuous = false;
-      serifFontRange.fontSampleEl = $('serif-font-sample');
-      serifFontRange.notifyChange = this.rangeChanged_.bind(this);
+      var standardFontRange = $('standard-font-size');
+      standardFontRange.valueMap = $('fixed-font-size').valueMap = [9, 10, 11,
+          12, 13, 14, 15, 16, 17, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 40,
+          44, 48, 56, 64, 72];
+      standardFontRange.continuous = false;
+      standardFontRange.fontSampleEl = $('standard-font-sample');
+      standardFontRange.notifyChange = this.rangeChanged_.bind(this);
 
       var minimumFontRange = $('minimum-font-size');
       minimumFontRange.valueMap = [9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20,
           22, 24];
       minimumFontRange.continuous = false;
       minimumFontRange.fontSampleEl = $('minimum-font-sample');
       minimumFontRange.notifyChange = this.rangeChanged_.bind(this);
       minimumFontRange.notifyPrefChange =
           this.minimumFontSizeChanged_.bind(this);
 
       var placeholder = localStrings.getString('fontSettingsPlaceholder');
-      $('serif-font-family').appendChild(new Option(placeholder));
+      $('standard-font-family').appendChild(new Option(placeholder));
       $('fixed-font-family').appendChild(new Option(placeholder));
       $('font-encoding').appendChild(new Option(placeholder));
-
-      // Add an additional listener to the font select menu for the
-      // 'sansserif_font_family' preference.
-      $('serif-font-family').addEventListener('change',
-          function(e) {
-            Preferences.setStringPref('webkit.webprefs.sansserif_font_family',
-                this.options[this.selectedIndex].value, '');
-          });
     },
 
     /**
      * Called by the options page when this page has been shown.
      */
     didShowPage: function() {
       // The fonts list may be large so we only load it when this page is
       // loaded for the first time.  This makes opening the options window
       // faster and consume less memory if the user never opens the fonts
       // dialog.
@@ skipping 67 matching lines @@
       }
 
       // Enable if not a managed pref.
       if (!element.managed)
         element.disabled = false;
     }
   };
 
   // Chrome callbacks
   FontSettings.setFontsData = function(fonts, encodings, selectedValues) {
-    FontSettings.getInstance().populateSelect_($('serif-font-family'), fonts,
+    FontSettings.getInstance().populateSelect_($('standard-font-family'), fonts,
                                                selectedValues[0]);
     FontSettings.getInstance().populateSelect_($('fixed-font-family'), fonts,
                                                selectedValues[1]);
     FontSettings.getInstance().populateSelect_($('font-encoding'), encodings,
                                                selectedValues[2]);
   };
 
-  FontSettings.setupSerifFontSample = function(font, size) {
-    FontSettings.getInstance().setupFontSample_($('serif-font-sample'), size,
+  FontSettings.setupStandardFontSample = function(font, size) {
+    FontSettings.getInstance().setupFontSample_($('standard-font-sample'), size,
                                                 font);
   };
 
   FontSettings.setupFixedFontSample = function(font, size) {
     FontSettings.getInstance().setupFontSample_($('fixed-font-sample'), size,
                                                 font);
   };
 
   FontSettings.setupMinimumFontSample = function(size) {
     FontSettings.getInstance().setupFontSample_($('minimum-font-sample'), size);
   };
 
   // Export
   return {
     FontSettings: FontSettings
   };
 });