Rewritten parts of NetworkLibrary to work around memory corruption that prev...

chrome/browser/resources/options/chromeos_internet_network_element.js

 // Copyright (c) 2010 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.internet', function() {
   /**
    * Creates a new network list div.
    * @param {Object=} opt_propertyBag Optional properties.
    * @constructor
    * @extends {HTMLDivElement}
@@ skipping 29 matching lines @@
     handleClick_: function(e) {
       // We shouldn't respond to click events selecting an input,
       // so return on those.
       if (e.target.tagName == 'INPUT') {
         return;
       }
       // Handle left button click
       if (e.button == 0) {
         var el = e.target;
         // If click is on action buttons of a network item.
-        if (el.buttonType && el.networkType && el.servicePath) {
-          chrome.send('buttonClickCallback',
-              [String(el.networkType), el.servicePath, el.buttonType]);
-        } else {
+        if (!(el.buttonType && el.networkType && el.servicePath)) {
           if (el.className == 'other-network' || el.buttonType) {
             return;
           }
           // If click is on a network item or its label, walk up the DOM tree
           // to find the network item.
           var item = el;
           while (item && !item.data) {
             item = item.parentNode;
           }
           if (item.connecting)
             return;
 
           if (item) {
             var data = item.data;
-            // Don't try to connect to Ethernet.
-            if (data && data.networkType == 1)
+            // Don't try to connect to Ethernet or unactivated Cellular.
+            if (data && (data.networkType == 1 ||
+                        (data.networkType == 5 && data.activation_state != 1)))
               return;
             for (var i = 0; i < this.childNodes.length; i++) {
               if (this.childNodes[i] != item)
                 this.childNodes[i].hidePassword();
             }
             // If clicked on other networks item.
             if (data && data.servicePath == '?') {
               item.showOtherLogin();
             } else if (data) {
                 if (!data.connecting && !data.connected) {
@@ skipping 111 matching lines @@
           this.data.activation_state !=
               NetworkItem.ACTIVATION_STATE_ACTIVATED &&
           this.data.activation_state !=
               NetworkItem.ACTIVATION_STATE_ACTIVATING;
 
         // Disconnect button if not ethernet and if cellular it should be
         // activated.
         if (this.data.networkType != NetworkItem.TYPE_ETHERNET &&
             !show_activate && this.data.connected) {
           buttonsDiv.appendChild(
-              this.createButton_('disconnect_button',
+              this.createButton_('disconnect_button', 'disconnect',
                                   function(e) {
                  chrome.send('buttonClickCallback',
                              [String(self.data.networkType),
                               self.data.servicePath,
                               'disconnect']);
                }));
         }
         // Show [Activate] button for non-activated Cellular network.
         if (show_activate) {
           buttonsDiv.appendChild(
-              this.createButton_('activate_button',
+              this.createButton_('activate_button', 'activate',
                                  function(e) {
                 chrome.send('buttonClickCallback',
                             [String(self.data.networkType),
                              self.data.servicePath,
                              'activate']);
               }));
         }
         if (this.data.connected) {
           buttonsDiv.appendChild(
-              this.createButton_('options_button',
+              this.createButton_('options_button', 'options',
                                  function(e) {
                 chrome.send('buttonClickCallback',
                             [String(self.data.networkType),
                              self.data.servicePath,
                              'options']);
               }));
         }
       } else {
         // Put "Forget this network" button.
         var button = this.createButton_('forget_button',
@@ skipping 137 matching lines @@
       ssid.disabled = true;
       pass.disabled = true;
       chrome.send('loginToNetwork', [ssid.value, pass.value]);
     },
 
     /**
      * Creates a button for interacting with a network.
      * @param {Object} name The name of the localStrings to use for the text.
      * @param {Object} type The type of button.
      */
-    createButton_: function(name, callback) {
+    createButton_: function(name, type, callback) {
       var buttonEl = this.ownerDocument.createElement('button');
+      buttonEl.buttonType = type;
       buttonEl.textContent = localStrings.getString(name);
       buttonEl.addEventListener('click', callback);
       return buttonEl;
     }
   };
 
   /**
    * Whether the underlying network is connected. Only used for display purpose.
    * @type {boolean}
    */
   cr.defineProperty(NetworkItem, 'connected', cr.PropertyKind.BOOL_ATTR);
 
   /**
    * Whether the underlying network is currently connecting.
    * Only used for display purpose.
    * @type {boolean}
    */
   cr.defineProperty(NetworkItem, 'connecting', cr.PropertyKind.BOOL_ATTR);
 
   return {
     NetworkElement: NetworkElement
   };
 });