More changes to make network settings better match extension API

chrome/browser/resources/options/chromeos/internet_detail.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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
 //   networkingPrivate API. See network_config.js.
 // See crbug.com/279351 for more info.
 
 /** @typedef {{address: (string|undefined),
  *             gateway: (string|undefined),
  *             nameServers: (string|undefined),
  *             netmask: (string|undefined),
  *             prefixLength: (number|undefined)}}
  * @see chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
  */
 var IPInfo;
 
-/**
- * InternetDetailedInfo argument passed to showDetailedInfo.
- * @see chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
- * @typedef {{
- *   servicePath: string,
- *   showCarrierSelect: (boolean|undefined),
- *   showViewAccountButton: (boolean|undefined)
- * }}
- */
-var InternetDetailedInfo;
-
 cr.define('options.internet', function() {
   var OncData = cr.onc.OncData;
   var Page = cr.ui.pageManager.Page;
   var PageManager = cr.ui.pageManager.PageManager;
   /** @const */ var IPAddressField = options.internet.IPAddressField;
 
   /** @const */ var GoogleNameServersString = '8.8.4.4,8.8.8.8';
   /** @const */ var CarrierGenericUMTS = 'Generic UMTS';
 
   /**
@@ skipping 57 matching lines @@
   /**
    * Sends the 'checked' state of a control to chrome for a network.
    * @param {string} path The service path of the network.
    * @param {string} message The message to send to chrome.
    * @param {string} checkboxId The id of the checkbox with the value to send.
    * @param {string=} opt_action Optional action to record.
    */
   function sendCheckedIfEnabled(path, message, checkboxId, opt_action) {
     var checkbox = assertInstanceof($(checkboxId), HTMLInputElement);
     if (!checkbox.hidden && !checkbox.disabled) {
-      chrome.send(message, [path, checkbox.checked ? 'true' : 'false']);
+      chrome.send(message, [path, !!checkbox.checked]);
       if (opt_action)
         sendChromeMetricsAction(opt_action);
     }
   }
 
   /**
    * Send metrics to Chrome when the detailed page is opened.
    * @param {string} type The ONC type of the network being shown.
    * @param {string} state The ONC network state.
    */
@@ skipping 50 matching lines @@
    * @extends {cr.ui.pageManager.Page}
    */
   function DetailsInternetPage() {
     // Cached Apn properties
     this.userApnIndex_ = -1;
     this.selectedApnIndex_ = -1;
     this.userApn_ = {};
     // We show the Proxy configuration tab for remembered networks and when
     // configuring a proxy from the login screen.
     this.showProxy_ = false;
-    // In Chrome we sometimes want to enable the Cellular carrier select UI.
-    this.showCarrierSelect_ = false;
-    // In Chrome we sometimes want to show the 'View Account' button.
-    this.showViewAccountButton_ = false;
 
     Page.call(this, 'detailsInternetPage', '', 'details-internet-page');
   }
 
   cr.addSingletonGetter(DetailsInternetPage);
 
   DetailsInternetPage.prototype = {
     __proto__: Page.prototype,
 
     /** @override */
     initializePage: function() {
       Page.prototype.initializePage.call(this);
       this.initializePageContents_();
       this.showNetworkDetails_();
     },
 
     /**
      * Auto-activates the network details dialog if network information
      * is included in the URL.
      */
     showNetworkDetails_: function() {
       var servicePath = parseQueryParams(window.location).servicePath;
       if (!servicePath || !servicePath.length)
         return;
-      var networkType = '';  // ignored for 'showDetails'
-      chrome.send('networkCommand', [networkType, servicePath, 'showDetails']);
+      // TODO(stevenjb): chrome.networkingPrivate.getManagedProperties
+      // with initializeDetailsPage as the callback.
+      chrome.send('getManagedProperties', [servicePath]);
     },
 
     /**
      * Initializes the contents of the page.
      */
     initializePageContents_: function() {
       $('details-internet-dismiss').addEventListener('click', function(event) {
         DetailsInternetPage.setDetails();
       });
 
@@ skipping 247 matching lines @@
       }
 
       return event;
     },
 
     /**
      * Update details page controls.
      */
     updateControls: function() {
       // Note: onc may be undefined when called from a pref update before
-      // initialized in sendNetworkDetails.
+      // initialized in initializeDetailsPage.
       var onc = this.onc_;
 
       // Always show the ipconfig section. TODO(stevenjb): Improve the display
       // for unconnected networks. Currently the IP address fields may be
       // blank if the network is not connected.
       $('ipconfig-section').hidden = false;
       $('ipconfig-dns-section').hidden = false;
 
       // Network type related.
       updateHidden('#details-internet-page .cellular-details',
@@ skipping 147 matching lines @@
       $('socks-host').disabled = allDisabled;
       $('socks-port').disabled = allDisabled;
       $('proxy-use-pac-url').disabled = true;
       $('proxy-pac-url').disabled = true;
       $('auto-proxy-parms').hidden = !$('auto-proxy').checked;
       $('manual-proxy-parms').hidden = !$('manual-proxy').checked;
       sendChromeMetricsAction('Options_NetworkManualProxy_Enable');
     },
 
     /**
-     * Helper method called from showDetailedInfo and updateConnectionData.
+     * Helper method called from initializeDetailsPage and updateConnectionData.
      * Updates visibility/enabled of the login/disconnect/configure buttons.
      * @private
      */
     updateConnectionButtonVisibilty_: function() {
       var onc = this.onc_;
       if (this.type_ == 'Ethernet') {
         // Ethernet can never be connected or disconnected and can always be
         // configured (e.g. to set security).
         $('details-internet-login').hidden = true;
         $('details-internet-disconnect').hidden = true;
@@ skipping 18 matching lines @@
       if (connectState != 'Connected' &&
           (!connectable || onc.getWiFiSecurity() != 'None' ||
           (this.type_ == 'WiMAX' || this.type_ == 'VPN'))) {
         $('details-internet-configure').hidden = false;
       } else {
         $('details-internet-configure').hidden = true;
       }
     },
 
     /**
-     * Helper method called from showDetailedInfo and updateConnectionData.
+     * Helper method called from initializeDetailsPage and updateConnectionData.
      * Updates the connection state property and account / sim card links.
      * @private
      */
     updateDetails_: function() {
       var onc = this.onc_;
 
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
       $('connection-state').textContent = connectionStateString;
 
       var type = this.type_;
       var showViewAccount = false;
       var showActivate = false;
       if (type == 'WiFi') {
         $('wifi-connection-state').textContent = connectionStateString;
       } else if (type == 'WiMAX') {
         $('wimax-connection-state').textContent = connectionStateString;
       } else if (type == 'Cellular') {
         $('activation-state').textContent =
             onc.getTranslatedValue('Cellular.ActivationState');
         if (onc.getActiveValue('Cellular.Family') == 'GSM') {
           var lockEnabled =
               onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
           $('sim-card-lock-enabled').checked = lockEnabled;
           $('change-pin').hidden = !lockEnabled;
         }
-        showViewAccount = this.showViewAccountButton_;
+        showViewAccount = onc.getActiveValue('showViewAccountButton');
         var activationState = onc.getActiveValue('Cellular.ActivationState');
         showActivate = activationState == 'NotActivated' ||
             activationState == 'PartiallyActivated';
       }
 
       $('view-account-details').hidden = !showViewAccount;
       $('activate-details').hidden = !showActivate;
       // If activation is not complete, hide the login button.
       if (showActivate)
         $('details-internet-login').hidden = true;
     },
 
     /**
-     * Helper method called from showDetailedInfo and updateConnectionData.
+     * Helper method called from initializeDetailsPage and updateConnectionData.
      * Updates the fields in the header section of the details frame.
      * @private
      */
     populateHeader_: function() {
       var onc = this.onc_;
 
       $('network-details-title').textContent = onc.getTranslatedValue('Name');
       var connectionState = onc.getActiveValue('ConnectionState');
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
       $('network-details-subtitle-status').textContent = connectionStateString;
@@ skipping 18 matching lines @@
         typeLabel.textContent = loadTimeData.getString(typeKey);
         typeLabel.hidden = false;
         typeSeparator.hidden = false;
       } else {
         typeLabel.hidden = true;
         typeSeparator.hidden = true;
       }
     },
 
     /**
-     * Helper method called from showDetailedInfo to initialize the Apn list.
+     * Helper method called from initializeDetailsPage to initialize the Apn
+     * list.
      * @private
      */
     initializeApnList_: function() {
       var onc = this.onc_;
 
       var apnSelector = $('select-apn');
       // Clear APN lists, keep only last element that "other".
       while (apnSelector.length != 1) {
         apnSelector.remove(0);
       }
@@ skipping 293 matching lines @@
       sendChromeMetricsAction('Options_NetworkDisconnectWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkDisconnectVPN');
     // TODO(stevenjb): chrome.networkingPrivate.startDisconnect
     chrome.send('startDisconnect', [detailsPage.servicePath_]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.configureNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    chrome.send('networkCommand',
-                [detailsPage.type_, detailsPage.servicePath_, 'configure']);
+    chrome.send('configureNetwork', [detailsPage.servicePath_]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.activateFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'Cellular') {
-      chrome.send('networkCommand',
-                  [detailsPage.type_, detailsPage.servicePath_, 'activate']);
+      chrome.send('activateNetwork', [detailsPage.servicePath_]);
     }
     PageManager.closeOverlay();
   };
 
   /**
    * Event handler called when the details page is closed. Sends changed
    * properties to Chrome and closes the overlay.
    */
   DetailsInternetPage.setDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
@@ skipping 71 matching lines @@
         break;
       case 'user':
         automaticDns.removeAttribute('selected');
         googleDns.removeAttribute('selected');
         userDns.setAttribute('selected', '');
         break;
     }
   };
 
   /**
-   * Method called from Chrome with a dictionary of non ONC configuration
-   * properties, including the HUID and service path to be used for requesting
-   * the ONC properties. Note: currently GUID is only used to confirm that the
-   * selected network still exists. It will be used instead of servicePath
-   * once switching to the networkingPrivate API (see TODO below).
-   * @param {InternetDetailedInfo} info
-   */
-  DetailsInternetPage.showDetailedInfo = function(info) {
-    if (!('GUID' in info)) {
-      // No network was found for, close the overlay.
-      PageManager.closeOverlay();
-      return;
-    }
-    var detailsPage = DetailsInternetPage.getInstance();
-    detailsPage.servicePath_ = info.servicePath;
-    detailsPage.showCarrierSelect_ = info.showCarrierSelect;
-    detailsPage.showViewAccountButton_ = info.showViewAccountButton;
-    // Ask Chrome to call sendNetworkDetails with the ONC properties.
-    // TODO(stevenjb): Use networkingPrivate.getManagedProperties(info.guid).
-    chrome.send('getManagedProperties', [info.servicePath]);
-  };
-
-  /**
    * Method called from Chrome when the ONC properties for the displayed
    * network may have changed.
    * @param {Object} oncData The updated ONC dictionary for the network.
    */
   DetailsInternetPage.updateConnectionData = function(oncData) {
     var detailsPage = DetailsInternetPage.getInstance();
     if (!detailsPage.visible)
       return;
 
     if (oncData.servicePath != detailsPage.servicePath_)
       return;
 
     // Update our cached data object.
     detailsPage.onc_ = new OncData(oncData);
 
     detailsPage.populateHeader_();
     detailsPage.updateConnectionButtonVisibilty_();
     detailsPage.updateDetails_();
   };
 
   /**
-   * Method called from Chrome when the initial dictionary of ONC configuration
-   * properties is available.
+   * Method called from Chrome in response to getManagedProperties.
+   * We only use this when we want to call initializeDetailsPage.
+   * TODO(stevenjb): Eliminate when we switch to networkingPrivate
+   * (initializeDetailsPage will be provided as the callback).
    * @param {Object} oncData Dictionary of ONC properties.
    */
-  DetailsInternetPage.sendNetworkDetails = function(oncData) {
+  DetailsInternetPage.getManagedPropertiesResult = function(oncData) {
+    DetailsInternetPage.initializeDetailsPage(oncData);
+  };
+
+  /**
+   * Initializes the details page with the provided ONC data.
+   * @param {Object} oncData Dictionary of ONC properties.
+   */
+  DetailsInternetPage.initializeDetailsPage = function(oncData) {
     var onc = new OncData(oncData);
 
     var detailsPage = DetailsInternetPage.getInstance();
+    detailsPage.servicePath_ = oncData.servicePath;
     detailsPage.onc_ = onc;
     var type = onc.getActiveValue('Type');
     detailsPage.type_ = type;
 
     sendShowDetailsMetrics(type, onc.getActiveValue('ConnectionState'));
 
     detailsPage.populateHeader_();
     detailsPage.updateConnectionButtonVisibilty_();
     detailsPage.updateDetails_();
 
@@ skipping 225 matching lines @@
       $('auto-connect-network-wimax').disabled = !remembered;
       var identity = onc.getActiveValue('WiMAX.EAP.Identity');
       setOrHideParent('wimax-eap-identity', identity);
       $('wimax-signal-strength').textContent = strengthString;
     } else if (type == 'Cellular') {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
 
       var isGsm = onc.getActiveValue('Cellular.Family') == 'GSM';
 
       var currentCarrierIndex = -1;
-      if (this.showCarrierSelect_) {
+      if (loadTimeData.getValue('showCarrierSelect')) {
         var currentCarrier =
             isGsm ? CarrierGenericUMTS : onc.getActiveValue('Cellular.Carrier');
         var supportedCarriers =
             onc.getActiveValue('Cellular.SupportedCarriers');
         for (var c1 = 0; c1 < supportedCarriers.length; ++c1) {
           if (supportedCarriers[c1] == currentCarrier) {
             currentCarrierIndex = c1;
             break;
           }
         }
@@ skipping 130 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });