Change behavior when clicking on a network from auto-connect to show options.

chrome/browser/resources/options2/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.
 
 cr.define('options.network', function() {
 
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var List = cr.ui.List;
   var ListItem = cr.ui.ListItem;
   var Menu = cr.ui.Menu;
@@ skipping 397 matching lines @@
       if (candidateURL)
         this.iconURL = candidateURL;
       else
         this.iconType = this.data.key;
 
       this.showSelector();
 
       if (policyManaged)
         this.showManagedNetworkIndicator();
 
-      // TODO(kevers): Add default icon for VPN when disconnected or in the
-      // process of connecting.
-
       if (activeMenu_ == this.getMenuName_()) {
         // Menu is already showing and needs to be updated. Explicitly calling
         // show menu will force the existing menu to be replaced.  The call
         // is deferred in order to ensure that position of this element has
         // beem properly updated.
         var self = this;
         setTimeout(function() {self.showMenu();}, 0);
       }
     },
 
@@ skipping 22 matching lines @@
                      data: {}};
         if (disabled) {
           entry.command = null;
           entry.tooltip =
               loadTimeData.getString('dataRoamingDisableToggleTooltip');
         } else {
           entry.command = function() {
             options.Preferences.setBooleanPref(
                 'cros.signed.data_roaming_enabled',
                 !enableDataRoaming_);
-            // Force revalidation of the menu the next time it is
-            // displayed.
+            // Force revalidation of the menu the next time it is displayed.
             this.menu_ = null;
           };
         }
         addendum.push(entry);
       }
       var list = this.data.rememberedNetworks;
       if (list && list.length > 0) {
         var callback = function(list) {
           $('remembered-network-list').clear();
           var dialog = options.PreferredNetworks.getInstance();
           OptionsPage.showPageByName('preferredNetworksPage', false);
           dialog.update(list);
         };
         addendum.push({label: loadTimeData.getString('preferredNetworks'),
                        command: callback,
                        data: list});
       }
 
       var networkGroup = this.ownerDocument.createElement('div');
       networkGroup.className = 'network-menu-group';
       var empty = true;
       list = this.data.networkList;
       if (list) {
         for (var i = 0; i < list.length; i++) {
           var data = list[i];
-          if (!data.connected && !data.connecting) {
-            if (data.networkType != Constants.TYPE_ETHERNET) {
-              if (data.networkType == Constants.TYPE_CELLULAR) {
-                // Test if cellular network has an activated data plan.
-                var activate = data.needs_new_plan ||
-                   (data.activation_state !=
-                   Constants.ACTIVATION_STATE_ACTIVATED &&
-                   data.activation_state !=
-                   Constants.ACTIVATION_STATE_ACTIVATING);
-                var cmd = activate ? 'activate' : 'connect';
-                this.createConnectCallback_(networkGroup, data, cmd);
-              } else {
-                this.createConnectCallback_(networkGroup, data);
-              }
-              empty = false;
-            }
-          } else if (data.connected) {
-            addendum.push({label: loadTimeData.getString('networkOptions'),
-                           command: 'options',
-                           data: data});
+          this.createNetworkOptionsCallback_(networkGroup, data);
+          empty = false;

[James Hawkins, 2012/08/02 21:36:45]

Huh, this seems unnecessary.  Can't you initialize |empty| to !!list.length
above?

[kevers, 2012/08/03 13:10:13]

Yes, logic can be simplified now that there is no conditional pruning.

+          if (data.connected) {
             if (data.networkType == Constants.TYPE_VPN) {
               // Add separator
               addendum.push({});
               var i18nKey = 'disconnectNetwork';
               addendum.push({label: loadTimeData.getString(i18nKey),
                              command: 'disconnect',
                              data: data});
             }
-            if (data.networkType != Constants.TYPE_ETHERNET) {
-              var onlineMessage = this.ownerDocument.createElement('div');
-              onlineMessage.textContent =
-                  loadTimeData.getString('networkOnline');
-              onlineMessage.className = 'network-menu-header';
-              menu.insertBefore(onlineMessage, menu.firstChild);
-            }
           }
         }
       }
       if (this.data_.key == 'wifi' || this.data_.key == 'wimax' ||
               this.data_.key == 'cellular') {
         addendum.push({});
         if (this.data_.key == 'wifi') {
           addendum.push({label: loadTimeData.getString('turnOffWifi'),
                        command: function() {
                          chrome.send('disableWifi');
@@ skipping 152 matching lines @@
       else
         buttonLabel.classList.add('network-disabled-control');
 
       button.data = {label: label};
       MenuItem.decorate(button);
       menu.appendChild(button);
       return button;
     },
 
     /**
-     * Adds a menu item for connecting to a network.
-     * @param {!Element} menu Parent menu.
+     * Adds a menu item for showing network details.
+     * @param {!Element} parent The parent element.
      * @param {Object} data Description of the network.
-     * @param {string=} opt_connect Optional connection method.
      * @private
      */
-    createConnectCallback_: function(menu, data, opt_connect) {
-      var cmd = opt_connect ? opt_connect : 'connect';
-      var label = data.networkName;
-      if (cmd == 'activate') {
-        label = loadTimeData.getString('activateNetwork');
-        label = label.replace('$1', data.networkName);
-      }
-      var menuItem = this.createCallback_(menu,
+    createNetworkOptionsCallback_: function(parent, data) {
+      var menuItem = this.createCallback_(parent,

[James Hawkins, 2012/08/02 21:36:45]

Optional nit: Condense parameters to save lines.

[kevers, 2012/08/03 13:10:13]

Done.

                                           data,
-                                          label,
-                                          cmd);
+                                          data.networkName,
+                                          'options');
       menuItem.style.backgroundImage = url(data.iconURL);
-
       if (data.policyManaged)
         menuItem.appendChild(new ManagedNetworkIndicator());
-
-      var optionsButton = this.ownerDocument.createElement('div');
-      optionsButton.className = 'network-options-button';
-      var type = String(data.networkType);
-      var path = data.servicePath;
-      optionsButton.addEventListener('click', function(event) {
-        event.stopPropagation();
-        chrome.send('networkCommand',
-                    [type, path, 'options']);
-        closeMenu_();
-      });
-      menuItem.appendChild(optionsButton);
+      if (data.connected || data.connecting) {
+        var label = menuItem.getElementsByClassName(
+            'network-menu-item-label')[0];
+        label.classList.add('active-network');
+      }
     }
   };
 
   /**
    * Creates a button-like control for configurating internet connectivity.
    * @param {{key: string,
    *          subtitle: string,
    *          command: function} data  Description of the network control.
    * @constructor
    */
@@ skipping 392 matching lines @@
    * Whether the Network list is disabled. Only used for display purpose.
    * @type {boolean}
    */
   cr.defineProperty(NetworkList, 'disabled', cr.PropertyKind.BOOL_ATTR);
 
   // Export
   return {
     NetworkList: NetworkList
   };
 });