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

chrome/browser/resources/options/advanced_options.js

Index: chrome/browser/resources/options/advanced_options.js
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index 051c3cf3d3d0db54e68838b1a9f342b0a33f56da..21269f27cb183665634efa8359b69149c6e3071d 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -59,7 +59,11 @@ var OptionsPage = options.OptionsPage;
       $('defaultZoomLevel').onchange = function(event) {
         chrome.send('defaultZoomLevelAction',
             [String(event.target.options[event.target.selectedIndex].value)]);
-      }
+      };
+      $('defaultFontSize').onchange = function(event) {
+        chrome.send('defaultFontSizeAction',
+            [String(event.target.options[event.target.selectedIndex].value)]);
+      };
 
       if (cr.isWindows || cr.isMac) {
         $('certificatesManageButton').onclick = function(event) {
@@ -169,6 +173,32 @@ var OptionsPage = options.OptionsPage;
     selectCtl.selectedIndex = 4;  // 100%
   };
 
+  // Set the font size selected item.
+  AdvancedOptions.SetFontSize = function(fixed_font_size_value,

[csilv, 2010/12/22 02:35:27]

It looks like this method only adds the custom option if fixed_font_size_value
!= font_size_value.  Shouldn't it also add it if the font size doesn't match one
of the items in the list?

[kmadhusu, 2010/12/22 19:15:02]

I am listening for "fixed_font_size_value" and "font_size_value" change.
Whenever either of these setting changes, it satisfies the condition
"fixed_font_size_value != font_size_value" therefore, I reset the font size
label to "Custom". 

For eg: 

Initial Values:
fixed_font_size_value = 16 
font_size_value = 16
fontSizeLabel = "Medium"

Step 1: Set fixed_font_size_value = 15
        I reset FontSizeLabel = "Custom"   (Since font_size_value = 16)

Step 2: Set font_size_value = 15
       => FontSizeLabel = "Custom" ( We do not modify the label value, because
the font size doesn't match any of the item values in the list). 

Hence, this code handles both the cases.

[csilv, 2010/12/22 19:32:38]

This method is also invoked when the pane is initialized (ie: SetupFontSizeLabel
in the .cc file).  So take the example where fixed_font_size_value and
font_size_value are both set to 15.  The selected choice should be "Custom", but
this method will not detect that case, and the result will be that the first
item, 'Very small' will be selected instead.

+      font_size_value) {
+    var selectCtl = $('defaultFontSize');
+
+    if (fixed_font_size_value != font_size_value) {
+      if (!$('Custom')) {
+        var option = new Option(localStrings.getString('FontSizeLabelCustom'),
+                                -1, false, true);
+        option.setAttribute("id","Custom");
+        selectCtl.add(option);
+      }
+      $('Custom').selected = true;
+      return;
+    }
+
+    for (var i = 0; i < selectCtl.options.length; i++) {
+      if (selectCtl.options[i].value == font_size_value) {
+        selectCtl.selectedIndex = i;
+        if ($('Custom'))
+          selectCtl.remove($('Custom').index);
+        return;
+      }
+    }
+  };
+
   // Set the download path.
   AdvancedOptions.SetDownloadLocationPath = function(path) {
     if (!cr.isChromeOS)