Revert https://codereview.chromium.org/1060993003

chrome/browser/resources/extensions/extensions.js

 // Copyright (c) 2012 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 src="../../../../ui/webui/resources/js/cr/ui/focus_row.js">
 <include src="../../../../ui/webui/resources/js/cr/ui/focus_grid.js">
 <include src="../uber/uber_utils.js">
 <include src="extension_code.js">
 <include src="extension_commands_overlay.js">
 <include src="extension_error_overlay.js">
 <include src="extension_focus_manager.js">
 <include src="extension_list.js">
 <include src="pack_extension_overlay.js">
 <include src="extension_loader.js">
 <include src="extension_options_overlay.js">
 
 <if expr="chromeos">
 <include src="chromeos/kiosk_apps.js">
 </if>
 
+/**
+ * The type of the extension data object. The definition is based on
+ * chrome/browser/ui/webui/extensions/extension_settings_handler.cc:
+ *     ExtensionSettingsHandler::HandleRequestExtensionsData()
+ * @typedef {{developerMode: boolean,
+ *            enableAppInfoDialog: boolean,
+ *            incognitoAvailable: boolean,
+ *            loadUnpackedDisabled: boolean,
+ *            profileIsSupervised: boolean}}
+ */
+var ExtensionDataResponse;
+
 // Used for observing function of the backend datasource for this page by
 // tests.
 var webuiResponded = false;
 
 cr.define('extensions', function() {
   var ExtensionList = extensions.ExtensionList;
 
   // Implements the DragWrapper handler interface.
   var dragWrapperHandler = {
     /** @override */
@@ skipping 100 matching lines @@
       measureCheckboxStrings();
 
       // Set the title.
       uber.setTitle(loadTimeData.getString('extensionSettings'));
 
       var extensionList = new ExtensionList();
       extensionList.id = 'extension-settings-list';
       var wrapper = $('extension-list-wrapper');
       wrapper.insertBefore(extensionList, wrapper.firstChild);
 
-      this.update_();
-      // TODO(devlin): Remove this once all notifications are moved to events on
-      // the developerPrivate api.
-      chrome.send('extensionSettingsRegister');
+      // This will request the data to show on the page and will get a response
+      // back in returnExtensionsData.
+      chrome.send('extensionSettingsRequestExtensionsData');
 
       var extensionLoader = extensions.ExtensionLoader.getInstance();
 
       $('toggle-dev-on').addEventListener('change', function(e) {
         this.updateDevControlsVisibility_(true);
         extensionList.updateFocusableElements();
-        chrome.developerPrivate.updateProfileConfiguration(
-            {inDeveloperMode: e.target.checked});
+        chrome.send('extensionSettingsToggleDeveloperMode',
+                    [$('toggle-dev-on').checked]);
       }.bind(this));
 
       window.addEventListener('resize', function() {
         this.updateDevControlsVisibility_(false);
       }.bind(this));
 
       // Set up the three dev mode buttons (load unpacked, pack and update).
       $('load-unpacked').addEventListener('click', function(e) {
         extensionLoader.loadUnpacked();
       });
@@ skipping 45 matching lines @@
       var path = document.location.pathname;
       if (path.length > 1) {
         // Skip starting slash and remove trailing slash (if any).
         var overlayName = path.slice(1).replace(/\/$/, '');
         if (overlayName == 'configureCommands')
           this.showExtensionCommandsConfigUi_();
       }
     },
 
     /**
-     * Updates the extensions page to the latest profile and extensions
-     * configuration.
-     * @private
-     */
-    update_: function() {
-      chrome.developerPrivate.getProfileConfiguration(
-          this.returnProfileConfiguration_.bind(this));
-    },
-
-    /**
-     * [Re]-Populates the page with data representing the current state of
-     * installed extensions.
-     * @param {ProfileInfo} profileInfo
-     * @private
-     */
-    returnProfileConfiguration_: function(profileInfo) {
-      webuiResponded = true;
-      /** @const */
-      var supervised = profileInfo.isSupervised;
-
-      var pageDiv = $('extension-settings');
-      pageDiv.classList.toggle('profile-is-supervised', supervised);
-      pageDiv.classList.toggle('showing-banner', supervised);
-
-      var devControlsCheckbox = $('toggle-dev-on');
-      devControlsCheckbox.checked = profileInfo.inDeveloperMode;
-      devControlsCheckbox.disabled = supervised;
-
-      this.updateDevControlsVisibility_(false);
-
-      $('load-unpacked').disabled = !profileInfo.canLoadUnpacked;
-      var extensionList = $('extension-settings-list');
-      extensionList.updateExtensionsData(
-          profileInfo.isIncognitoAvailable,
-          profileInfo.appInfoDialogEnabled).then(function() {
-        // We can get called many times in short order, thus we need to
-        // be careful to remove the 'finished loading' timeout.
-        if (this.loadingTimeout_)
-          window.clearTimeout(this.loadingTimeout_);
-        document.documentElement.classList.add('loading');
-        this.loadingTimeout_ = window.setTimeout(function() {
-          document.documentElement.classList.remove('loading');
-        }, 0);
-
-        /** @const */
-        var hasExtensions = extensionList.getNumExtensions() != 0;
-        $('no-extensions').hidden = hasExtensions;
-        $('extension-list-wrapper').hidden = !hasExtensions;
-        $('extension-settings-list').updateFocusableElements();
-      }.bind(this));
-    },
-
-    /**
      * Handles the Pack Extension button.
      * @param {Event} e Change event.
      * @private
      */
     handlePackExtension_: function(e) {
       ExtensionSettings.showOverlay($('pack-extension-overlay'));
       chrome.send('metricsHandler:recordAction', ['Options_PackExtension']);
     },
 
     /**
@@ skipping 45 matching lines @@
       });
       buttons.setAttribute('aria-hidden', !showDevControls);
 
       window.requestAnimationFrame(function() {
         devControls.style.height = !showDevControls ? '' :
             buttons.offsetHeight + 'px';
       }.bind(this));
     },
   };
 
-  ExtensionSettings.onExtensionsChanged = function() {
-    ExtensionSettings.getInstance().update_();
+  /**
+   * Called by the dom_ui_ to re-populate the page with data representing
+   * the current state of installed extensions.
+   * @param {ExtensionDataResponse} extensionsData
+   */
+  ExtensionSettings.returnExtensionsData = function(extensionsData) {
+    webuiResponded = true;
+
+    var supervised = extensionsData.profileIsSupervised;
+
+    var pageDiv = $('extension-settings');
+    pageDiv.classList.toggle('profile-is-supervised', supervised);
+    pageDiv.classList.toggle('showing-banner', supervised);
+
+    var devControlsCheckbox = $('toggle-dev-on');
+    devControlsCheckbox.checked = extensionsData.developerMode;
+    devControlsCheckbox.disabled = supervised;
+
+    ExtensionSettings.getInstance().updateDevControlsVisibility_(false);
+
+    $('load-unpacked').disabled = extensionsData.loadUnpackedDisabled;
+    var extensionList = $('extension-settings-list');
+    extensionList.updateExtensionsData(
+        extensionsData.incognitoAvailable,
+        extensionsData.enableAppInfoDialog).then(function() {
+      // We can get called many times in short order, thus we need to
+      // be careful to remove the 'finished loading' timeout.
+      if (this.loadingTimeout_)
+        window.clearTimeout(this.loadingTimeout_);
+      this.loadingTimeout_ = window.setTimeout(function() {
+        document.documentElement.classList.remove('loading');
+      }, 0);
+
+      var hasExtensions = extensionList.getNumExtensions() != 0;
+      $('no-extensions').hidden = hasExtensions;
+      $('extension-list-wrapper').hidden = !hasExtensions;
+      $('extension-settings-list').updateFocusableElements();
+    }.bind(this));
   };
 
   /**
    * Returns the current overlay or null if one does not exist.
    * @return {Element} The overlay element.
    */
   ExtensionSettings.getCurrentOverlay = function() {
     return document.querySelector('#overlay .page.showing');
   };
 
@@ skipping 95 matching lines @@
   // Export
   return {
     ExtensionSettings: ExtensionSettings
   };
 });
 
 window.addEventListener('load', function(e) {
   document.documentElement.classList.add('loading');
   extensions.ExtensionSettings.getInstance().initialize();
 });