Cleanup of network code.

chrome/browser/resources/options2/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.
 
 cr.define('options.internet', function() {
   var OptionsPage = options.OptionsPage;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
+   * Network settings constants. These enums must match their C++
+   * counterparts.
+   */
+  function Constants() {}
+
+  // Network types:
+  Constants.TYPE_UNKNOWN = 0;
+  Constants.TYPE_ETHERNET = 1;
+  Constants.TYPE_WIFI = 2;
+  Constants.TYPE_WIMAX = 3;
+  Constants.TYPE_BLUETOOTH = 4;
+  Constants.TYPE_CELLULAR = 5;
+  Constants.TYPE_VPN = 6;
+
+  /*
    * Minimum delay in milliseconds before updating controls.  Used to
    * consolidate update requests resulting from preference update
    * notifications.
    * @type {Number}
    * @const
    */
   var minimumUpdateContentsDelay_ = 50;
 
   /**
    * Time of the last request to update controls in milliseconds.
@@ skipping 99 matching lines @@
      * Auto-activates the network details dialog if network information
      * is included in the URL.
      */
     showNetworkDetails_: function() {
       var params = parseQueryParams(window.location);
       var servicePath = params.servicePath;
       var networkType = params.networkType;
       if (!servicePath || !servicePath.length ||
           !networkType || !networkType.length)
         return;
-      // TODO(kevers): Use more descriptive name for callback.
-      chrome.send('buttonClickCallback',
+      chrome.send('networkCommand',
           [networkType, servicePath, 'options']);
     },
 
     /**
      * Initializes the contents of the page.
      */
     initializePageContents_: function() {
       $('details-internet-dismiss').addEventListener('click', function(event) {
         DetailsInternetPage.setDetails();
       });
@@ skipping 372 matching lines @@
 
   DetailsInternetPage.updateSecurityTab = function(requirePin) {
     $('sim-card-lock-enabled').checked = requirePin;
     $('change-pin').hidden = !requirePin;
   };
 
 
   DetailsInternetPage.loginFromDetails = function() {
     var data = $('connection-state').data;
     var servicePath = data.servicePath;
-    // TODO(kevers): Use more descriptive name for callback.
-    chrome.send('buttonClickCallback', [String(data.type),
+    chrome.send('networkCommand', [String(data.type),
                                           servicePath,
                                           'connect']);
     OptionsPage.closeOverlay();
   };
 
   DetailsInternetPage.disconnectNetwork = function() {
     var data = $('connection-state').data;
     var servicePath = data.servicePath;
-    // TODO(kevers): Use more descriptive name for callback.
-    chrome.send('buttonClickCallback', [String(data.type),
+    chrome.send('networkCommand', [String(data.type),
                                         servicePath,
                                         'disconnect']);
     OptionsPage.closeOverlay();
   };
 
   DetailsInternetPage.activateFromDetails = function() {
     var data = $('connection-state').data;
     var servicePath = data.servicePath;
-    if (data.type == options.internet.Constants.TYPE_CELLULAR) {
-      // TODO(kevers): Use more descriptive name for callback.
-      chrome.send('buttonClickCallback', [String(data.type),
+    if (data.type == Constants.TYPE_CELLULAR) {
+      chrome.send('networkCommand', [String(data.type),
                                           String(servicePath),
                                           'activate']);
     }
     OptionsPage.closeOverlay();
   };
 
   DetailsInternetPage.setDetails = function() {
     var data = $('connection-state').data;
     var servicePath = data.servicePath;
-    if (data.type == options.internet.Constants.TYPE_WIFI) {
+    if (data.type == Constants.TYPE_WIFI) {
       chrome.send('setPreferNetwork',
                    [String(servicePath),
                     $('prefer-network-wifi').checked ? 'true' : 'false']);
       chrome.send('setAutoConnect',
                   [String(servicePath),
                    $('auto-connect-network-wifi').checked ? 'true' : 'false']);
-    } else if (data.type == options.internet.Constants.TYPE_CELLULAR) {
+    } else if (data.type == Constants.TYPE_CELLULAR) {
       chrome.send('setAutoConnect',
                   [String(servicePath),
                    $('auto-connect-network-cellular').checked ? 'true' :
                        'false']);
     }
     var ipConfigList = $('ip-config-list');
     chrome.send('setIPConfig', [String(servicePath),
                                 $('ip-type-dhcp').checked ? 'true' : 'false',
                                 ipConfigList.dataModel.item(0).value,
                                 ipConfigList.dataModel.item(1).value,
                                 ipConfigList.dataModel.item(2).value,
                                 ipConfigList.dataModel.item(3).value]);
     OptionsPage.closeOverlay();
   };
 
   DetailsInternetPage.showDetailedInfo = function(data) {
     var detailsPage = DetailsInternetPage.getInstance();
 
     // Populate header
     $('network-details-title').textContent = data.networkName;
     var statusKey = data.connected ? 'networkConnected' :
                                      'networkNotConnected';
     $('network-details-subtitle-status').textContent =
         localStrings.getString(statusKey);
     var typeKey = null;
-    var Constants = options.internet.Constants;
     switch (data.type) {
     case Constants.TYPE_ETHERNET:
       typeKey = 'ethernetTitle';
       break;
     case Constants.TYPE_WIFI:
       typeKey = 'wifiTitle';
       break;
     case Constants.TYPE_CELLULAR:
       typeKey = 'cellularTitle';
       break;
@@ skipping 13 matching lines @@
     }
 
     // TODO(chocobo): Is this hack to cache the data here reasonable?
     // TODO(kevers): Find more appropriate place to cache data.
     $('connection-state').data = data;
 
     $('buyplan-details').hidden = true;
     $('activate-details').hidden = true;
     $('view-account-details').hidden = true;
     $('details-internet-login').hidden = data.connected;
-    if (data.type == options.internet.Constants.TYPE_ETHERNET)
+    if (data.type == Constants.TYPE_ETHERNET)
       $('details-internet-disconnect').hidden = true;
     else
       $('details-internet-disconnect').hidden = !data.connected;
 
     detailsPage.deviceConnected = data.deviceConnected;
     detailsPage.connecting = data.connecting;
     detailsPage.connected = data.connected;
     detailsPage.showProxy = data.showProxy;
     $('connection-state').textContent = data.connectionState;
 
@@ skipping 73 matching lines @@
       ipConfigList.selectionModel.selectedIndex = 0;
     });
 
     if (data.hardwareAddress) {
       $('hardware-address').textContent = data.hardwareAddress;
       $('hardware-address-row').style.display = 'table-row';
     } else {
       // This is most likely a device without a hardware address.
       $('hardware-address-row').style.display = 'none';
     }
-    if (data.type == options.internet.Constants.TYPE_WIFI) {
+    if (data.type == Constants.TYPE_WIFI) {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       detailsPage.wireless = true;
       detailsPage.vpn = false;
       detailsPage.ethernet = false;
       detailsPage.cellular = false;
       detailsPage.gsm = false;
       detailsPage.shared = data.shared;
       $('wifi-connection-state').textContent = data.connectionState;
       $('wifi-ssid').textContent = data.ssid;
       if (data.bssid && data.bssid.length > 0) {
@@ skipping 25 matching lines @@
         $('wifi-hardware-address-entry').hidden = false;
       } else {
         $('wifi-hardware-address-entry').hidden = true;
       }
       detailsPage.showPreferred = data.showPreferred;
       $('prefer-network-wifi').checked = data.preferred.value;
       $('prefer-network-wifi').disabled = !data.remembered;
       $('auto-connect-network-wifi').checked = data.autoConnect.value;
       $('auto-connect-network-wifi').disabled = !data.remembered;
       detailsPage.password = data.encrypted;
-    } else if (data.type == options.internet.Constants.TYPE_CELLULAR) {
+    } else if (data.type == Constants.TYPE_CELLULAR) {
       if (!data.gsm)
         OptionsPage.showTab($('cellular-plan-nav-tab'));
       else
         OptionsPage.showTab($('cellular-conn-nav-tab'));
       detailsPage.ethernet = false;
       detailsPage.wireless = false;
       detailsPage.vpn = false;
       detailsPage.cellular = true;
       $('service-name').textContent = data.serviceName;
       $('network-technology').textContent = data.networkTechnology;
@@ skipping 73 matching lines @@
 
       detailsPage.hascellplan = false;
       if (data.connected) {
         detailsPage.nocellplan = false;
         detailsPage.cellplanloading = true;
         chrome.send('refreshCellularPlan', [data.servicePath]);
       } else {
         detailsPage.nocellplan = true;
         detailsPage.cellplanloading = false;
       }
-    } else if (data.type == options.internet.Constants.TYPE_VPN) {
+    } else if (data.type == Constants.TYPE_VPN) {
       OptionsPage.showTab($('vpn-nav-tab'));
       detailsPage.wireless = false;
       detailsPage.vpn = true;
       detailsPage.ethernet = false;
       detailsPage.cellular = false;
       detailsPage.gsm = false;
       $('inet-service-name').textContent = data.service_name;
       $('inet-server-hostname').textContent = data.server_hostname;
       $('inet-provider-type').textContent = data.provider_type;
       $('inet-username').textContent = data.username;
@@ skipping 30 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.
     OptionsPage.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });