Merge 95301 - Options: Fix the startup pages list.

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
===================================================================
--- chrome/browser/resources/options/browser_options.js	(revision 95304)
+++ chrome/browser/resources/options/browser_options.js	(working copy)
@@ -63,6 +63,14 @@
       $('toolbarShowBookmarksBar').onchange = function() {
         chrome.send('toggleShowBookmarksBar');
       };
+      var items = document.querySelectorAll('input[name=startup]');
+      for (i = 0; i < items.length; i++) {
+        items[i].onchange = function(event) {
+          chrome.send('setRestoreOnStartup', [event.target.value]);
+          chrome.send('coreOptionsUserMetricsAction',
+              [event.target.getAttribute('metric')]);
+        };
+      }
       $('defaultSearchManageEnginesButton').onclick = function(event) {
         OptionsPage.navigateToPage('searchEngines');
         chrome.send('coreOptionsUserMetricsAction',
@@ -258,6 +266,21 @@
     },
 
     /**
+     * Updates the startup radio group with the given value.
+     * @param {number} value the preference value being set.
+     * @private
+     */
+    updateRestoreOnStartup_: function(value) {
+      var items = document.querySelectorAll('input[name=startup]');
+      for (i = 0; i < items.length; i++) {
+        if (items[i].value == value)
+          items[i].checked = true;
+      }
+
+      this.updateCustomStartupPageControlStates_();
+    },
+
+    /**
      * Updates the startup pages list with the given entries.
      * @param {Array} pages List of startup pages.
      * @private
@@ -510,6 +533,10 @@
                                                       defaultManaged);
   };
 
+  BrowserOptions.updateRestoreOnStartup = function(value) {
+    BrowserOptions.getInstance().updateRestoreOnStartup_(value);
+  };
+
   BrowserOptions.updateStartupPages = function(pages) {
     BrowserOptions.getInstance().updateStartupPages_(pages);
   };