More changes to make network settings better match extension API

chrome/browser/resources/options/chromeos/network_list.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.
 
 /**
  * @typedef {{
  *   ConnectionState: string,
  *   iconURL: string,
  *   policyManaged: boolean,
  *   servicePath: string
@@ skipping 131 matching lines @@
   }
 
   /**
    * @param {string} action An action to send to coreOptionsUserMetricsAction.
    */
   function sendChromeMetricsAction(action) {
     chrome.send('coreOptionsUserMetricsAction', [action]);
   }
 
   /**
+   * @param {string} servicePath The network service path.
+   */
+  function showDetails(servicePath) {
+    // TODO(stevenjb): chrome.networkingPrivate.getManagedProperties
+    // (Note: we will need to provide DetailsInternetPage.initializeDetailsPage
+    // as the callback).
+    chrome.send('getManagedProperties', [servicePath]);
+  }
+
+  /**
    * Decorate an element as a NetworkListItem.
    * @param {!Element} el The element to decorate.
    */
   NetworkListItem.decorate = function(el) {
     el.__proto__ = NetworkListItem.prototype;
     el.decorate();
   };
 
   NetworkListItem.prototype = {
     __proto__: ListItem.prototype,
@@ skipping 520 matching lines @@
       return networkButtons;
     },
 
     /**
      * Adds a menu item for showing network details.
      * @param {!Element} parent The parent element.
      * @param {Object} data Description of the network.
      * @private
      */
     createNetworkOptionsCallback_: function(parent, data) {
+      var servicePath = data.servicePath;
+      var showDetailsCallback = function() {
+        showDetails(servicePath);
+      };
       var menuItem = createCallback_(parent,
                                      data,
                                      getNetworkName(data),
-                                     'showDetails',
+                                     showDetailsCallback,

[pneubeck (no reviews), 2014/10/27 16:37:19]

showDetails.bind(null, data.servicePath);

is IMO a bit clearer, because it also makes the 'this' argument explicit.

[stevenjb, 2014/10/27 17:32:33]

Done.

                                      data.iconURL);
       if (data.policyManaged)
         menuItem.appendChild(new ManagedNetworkIndicator());
       if (data.ConnectionState == 'Connected' ||
           data.ConnectionState == 'Connecting') {
         var label = menuItem.getElementsByClassName(
             'network-menu-item-label')[0];
         label.classList.add('active-network');
       }
     }
@@ skipping 31 matching lines @@
       if (this.data.policyManaged)
         this.showManagedNetworkIndicator();
     },
   };
 
   /**
    * Adds a command to a menu for modifying network settings.
    * @param {!Element} menu Parent menu.
    * @param {Object} data Description of the network.
    * @param {!string} label Display name for the menu item.
-   * @param {?(string|!Function)} command Callback function or name
-   *     of the command for |networkCommand|.
+   * @param {!Function} command Callback function.
    * @param {string=} opt_iconURL Optional URL to an icon for the menu item.
    * @return {!Element} The created menu item.
    * @private
    */
   function createCallback_(menu, data, label, command, opt_iconURL) {
     var button = menu.ownerDocument.createElement('div');
     button.className = 'network-menu-item';
 
     var buttonIcon = menu.ownerDocument.createElement('div');
     buttonIcon.className = 'network-menu-item-icon';
     button.appendChild(buttonIcon);
     if (opt_iconURL)
       buttonIcon.style.backgroundImage = url(opt_iconURL);
 
     var buttonLabel = menu.ownerDocument.createElement('span');
     buttonLabel.className = 'network-menu-item-label';
     buttonLabel.textContent = label;
     button.appendChild(buttonLabel);
     var callback = null;
-    if (typeof command == 'string') {
-      var type = data.Type;
-      var path = data.servicePath;
-      callback = function() {
-        chrome.send('networkCommand', [type, path, command]);
-        closeMenu_();
-      };
-    } else if (command != null) {
+    if (command != null) {
       if (data) {
         callback = function() {
           (/** @type {Function} */(command))(data);
           closeMenu_();
         };
       } else {
         callback = function() {
           (/** @type {Function} */(command))();
           closeMenu_();
         };
@@ skipping 228 matching lines @@
     cellularSimLockType_ = data.cellularSimLockType;
     wimaxAvailable_ = data.wimaxAvailable;
     wimaxEnabled_ = data.wimaxEnabled;
 
     // Only show Ethernet control if connected.
     var ethernetConnection = getConnection_(data.wiredList);
     if (ethernetConnection) {
       var type = String('Ethernet');
       var path = ethernetConnection.servicePath;
       var ethernetOptions = function() {
-        chrome.send('networkCommand', [type, path, 'showDetails']);
+        showDetails(path);
       };
       networkList.update(
           { key: 'Ethernet',
             subtitle: loadTimeData.getString('OncConnectionStateConnected'),
             iconURL: ethernetConnection.iconURL,
             command: ethernetOptions,
             policyManaged: ethernetConnection.policyManaged }
           );
     } else {
       networkList.deleteItem('Ethernet');
@@ skipping 180 matching lines @@
    * @param {string} type An ONC network type
    * @return {function()} The created callback.
    * @private
    */
   function createAddConnectionCallback_(type) {
     return function() {
       if (type == 'WiFi')
         sendChromeMetricsAction('Options_NetworkJoinOtherWifi');
       else if (type == 'VPN')
         sendChromeMetricsAction('Options_NetworkJoinOtherVPN');
-      chrome.send('networkCommand', [type, '', 'add']);
+      chrome.send('addConnection', [type]);
     };
   }
 
   /**
    * Whether the Network list is disabled. Only used for display purpose.
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });