DOMUI Prefs: Remove the startup page managment sub-page

chrome/browser/resources/options/browser_options.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() {
   const OptionsPage = options.OptionsPage;
   const ArrayDataModel = cr.ui.ArrayDataModel;
   const ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
 
   //
@@ skipping 26 matching lines @@
      * Initialize BrowserOptions page.
      */
     initializePage: function() {
       // Call base class implementation to start preference initialization.
       OptionsPage.prototype.initializePage.call(this);
 
       // Wire up controls.
       $('startupUseCurrentButton').onclick = function(event) {
         chrome.send('setStartupPagesToCurrentPages');
       };
-      $('startupPageManagerButton').onclick = function(event) {
-        OptionsPage.showPageByName('startupPages');
+      $('startupAddButton').onclick = function(event) {
+        OptionsPage.showOverlay('addStartupPageOverlay');
       };
       $('defaultSearchManageEnginesButton').onclick = function(event) {
         OptionsPage.showPageByName('searchEngines');
         chrome.send('coreOptionsUserMetricsAction',
             ['Options_ManageSearchEngines']);
       };
       $('instantEnableCheckbox').onclick = function(event) {
         var alreadyConfirmed = $('instantDialogShown').checked;
 
         if (this.checked && !alreadyConfirmed) {
           // Leave disabled for now. The PrefCheckbox handler already set it to
           // true so undo that.
           Preferences.setBooleanPref(this.pref, false, this.metric);
           OptionsPage.showOverlay('instantConfirmOverlay');
         }
       };
       $('defaultSearchEngine').onchange = this.setDefaultSearchEngine;
 
       var homepageField = $('homepageURL');
       $('homepageUseNTPButton').onchange =
           this.handleHomepageUseNTPButtonChange_.bind(this);
       $('homepageUseURLButton').onchange =
           this.handleHomepageUseURLButtonChange_.bind(this);
       homepageField.onchange = this.handleHomepageURLChange_.bind(this);
       homepageField.oninput = this.handleHomepageURLChange_.bind(this);
 
       // Ensure that changes are committed when closing the page.
       window.addEventListener('unload', function() {
-          if (document.activeElement == homepageField)
-            homepageField.blur();
-          });
+        if (document.activeElement == homepageField)
+          homepageField.blur();
+      });
+
+      // Remove Windows-style accelerators from button labels.
+      // TODO(stuartmorgan): Remove this once the strings are updated.
+      $('startupAddButton').textContent =
+          localStrings.getStringWithoutAccelerator('startupAddButton');
 
       if (!cr.isChromeOS) {
         $('defaultBrowserUseAsDefaultButton').onclick = function(event) {
           chrome.send('becomeDefaultBrowser');
         };
       }
 
-      var list = $('startupPagesShortList');
+      var list = $('startupPagesList');
       options.browser_options.StartupPageList.decorate(list);
       list.autoExpands = true;
       list.selectionModel = new ListSingleSelectionModel;
 
       // Check if we are in the guest mode.
       if (cr.commandLine.options['--bwsi']) {
         // Hide the startup section.
         $('startupSection').classList.add('hidden');
       } else {
         // Initialize control enabled states.
@@ skipping 64 matching lines @@
     shouldEnableCustomStartupPageControls_: function(pages) {
       return $('startupShowPagesButton').checked;
     },
 
     /**
      * Updates the startup pages list with the given entries.
      * @private
      * @param {Array} pages List of startup pages.
      */
     updateStartupPages_: function(pages) {
-      var list = $('startupPagesShortList');
-      list.dataModel = new ArrayDataModel(pages);
-      if (pages.length > 0 && pages.length <= 10) {
-        list.classList.remove("hidden");
-        $('startupPageManagement').classList.add('settings-list');
-        $('startupShowPagesLabel').textContent =
-            localStrings.getStringWithoutAccelerator('startupShowPages');
-      } else {
-        list.classList.add("hidden");
-        $('startupPageManagement').classList.remove('settings-list');
-        $('startupShowPagesLabel').textContent =
-            localStrings.getStringWithoutAccelerator('startupShowManyPages');
-      }
+      $('startupPagesList').dataModel = new ArrayDataModel(pages);
     },
 
     /**
      * Handles change events of the radio button 'homepageUseURLButton'.
      * @private
      * @param {event} change event.
      */
     handleHomepageUseURLButtonChange_: function(event) {
       Preferences.setBooleanPref('homepage_is_newtabpage', false);
     },
@@ skipping 142 matching lines @@
                 !this.homepage_is_newtabpage_pref_.managed));
     },
 
     /**
      * Sets the enabled state of the custom startup page list controls
      * based on the current startup radio button selection.
      * @private
      */
     updateCustomStartupPageControlStates_: function() {
       var disable = !this.shouldEnableCustomStartupPageControls_();
-      $('startupPagesShortList').disabled = disable;
+      $('startupPagesList').disabled = disable;
       $('startupUseCurrentButton').disabled = disable;
-      $('startupPageManagerButton').disabled = disable;
+      $('startupAddButton').disabled = disable;
     },
 
     /**
      * Set the default search engine based on the popup selection.
      */
     setDefaultSearchEngine: function() {
       var engineSelect = $('defaultSearchEngine');
       var selectedIndex = engineSelect.selectedIndex;
       if (selectedIndex >= 0) {
         var selection = engineSelect.options[selectedIndex];
         chrome.send('setDefaultSearchEngine', [String(selection.value)]);
       }
     },
+
+    /**
+     * Adds the given startup page at the current selection point.
+     * @private
+     */
+    addStartupPage_: function(url) {
+      var selectedIndex =
+          $('startupPagesList').selectionModel.selectedIndex;
+      chrome.send('addStartupPage', [url, String(selectedIndex)]);
+    },
   };
 
   BrowserOptions.updateDefaultBrowserState = function(statusString, isDefault,
                                                       canBeDefault) {
     if (!cr.isChromeOS) {
       BrowserOptions.getInstance().updateDefaultBrowserState_(statusString,
                                                               isDefault,
                                                               canBeDefault);
     }
   };
 
   BrowserOptions.updateSearchEngines = function(engines, defaultValue) {
     BrowserOptions.getInstance().updateSearchEngines_(engines, defaultValue);
   };
 
   BrowserOptions.updateStartupPages = function(pages) {
     BrowserOptions.getInstance().updateStartupPages_(pages);
-    StartupPageManager.getInstance().updateStartupPages_(pages);
+  };
+
+  BrowserOptions.addStartupPage = function(url) {
+    BrowserOptions.getInstance().addStartupPage_(url);
   };
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 
 });