Use GUID instead of servicePath in network settings

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 chrome.networkingPrivate calls.
@@ skipping 194 matching lines @@
       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)
+      var guid = parseQueryParams(window.location).guid;
+      if (!guid || !guid.length)

[pneubeck (no reviews), 2015/03/12 20:53:57]

on the C++ side, this is actually also called without guid (previously without
service_path).
Does that really work?

[stevenjb, 2015/03/13 01:20:14]

Yes. initializePage always gets called, and if the parameter is provided it
shows the details page (from the callback), otherwise it does not.

         return;
-      // TODO(stevenjb): chrome.networkingPrivate.getManagedProperties
-      // with initializeDetailsPage as the callback.
-      chrome.send('getManagedProperties', [servicePath]);
+      chrome.networkingPrivate.getManagedProperties(
+        guid, function(oncProperties) {
+          DetailsInternetPage.initializeDetailsPage(oncProperties);

[pneubeck (no reviews), 2015/03/12 20:53:57]

instead of the anonymous function you could use
  DetailsInternetPage.initializeDetailsPage.bind(DetailsInternetPage)

(or without .bind() if it doesn't need a specific |this|)

[stevenjb, 2015/03/13 01:20:14]

Done.

+        });
     },
 
     /**
      * Initializes the contents of the page.
      */
     initializePageContents_: function() {
       $('details-internet-dismiss').addEventListener('click', function(event) {
         DetailsInternetPage.setDetails();
       });
 
@@ skipping 13 matching lines @@
         DetailsInternetPage.setDetails();
         DetailsInternetPage.configureNetwork();
       });
 
       $('activate-details').addEventListener('click', function(event) {
         DetailsInternetPage.activateFromDetails();
       });
 
       $('view-account-details').addEventListener('click', function(event) {
         chrome.send('showMorePlanInfo',
-                    [DetailsInternetPage.getInstance().servicePath_]);
+                    [DetailsInternetPage.getInstance().onc_.guid()]);
         PageManager.closeOverlay();
       });
 
       $('cellular-apn-use-default').addEventListener('click', function(event) {
         DetailsInternetPage.getInstance().setDefaultApn_();
       });
 
       $('cellular-apn-set').addEventListener('click', function(event) {
         DetailsInternetPage.getInstance().setApn_($('cellular-apn').value);
       });
@@ skipping 636 matching lines @@
       if (apnName) {
         activeApn['AccessPointName'] = apnName;
         activeApn['Username'] = stringFromValue(apnValue['Username']);
         activeApn['Password'] = stringFromValue(apnValue['Password']);
       }
       // Set the cached ONC data.
       this.onc_.setProperty('Cellular.APN', activeApn);
       // Set an ONC object with just the APN values.
       var oncData = new OncData({});
       oncData.setProperty('Cellular.APN', activeApn);
-      // TODO(stevenjb): chrome.networkingPrivate.setProperties
-      chrome.send('setProperties', [this.servicePath_, oncData.getData()]);
+      chrome.networkingPrivate.setProperties(this.onc_.guid(),
+                                             oncData.getData());
     },
 
     /**
      * Event Listener for the cellular-apn-use-default button.
      * @private
      */
     setDefaultApn_: function() {
       var apnSelector = $('select-apn');
 
       // Remove the 'user' entry if it exists.
@@ skipping 124 matching lines @@
     DetailsInternetPage.changeCellularButtonsState(visible);
   };
 
   /**
    * Changes the network carrier.
    */
   DetailsInternetPage.handleCarrierChanged = function() {
     var carrierSelector = $('select-carrier');
     var carrier = carrierSelector[carrierSelector.selectedIndex].textContent;
     DetailsInternetPage.showCarrierChangeSpinner(true);
-    chrome.send('setCarrier', [
-      DetailsInternetPage.getInstance().servicePath_, carrier]);
+    chrome.send('setCarrier', [carrier]);
   };
 
   /**
    * Performs minimal initialization of the InternetDetails dialog in
    * preparation for showing proxy-settings.
    */
   DetailsInternetPage.initializeProxySettings = function() {
     DetailsInternetPage.getInstance().initializePageContents_();
   };
 
@@ skipping 59 matching lines @@
     DetailsInternetPage.showCarrierChangeSpinner(false);
   };
 
   DetailsInternetPage.loginFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'WiFi')
       sendChromeMetricsAction('Options_NetworkConnectToWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkConnectToVPN');
     // TODO(stevenjb): chrome.networkingPrivate.startConnect
-    chrome.send('startConnect', [detailsPage.servicePath_]);
+    chrome.send('startConnect', [detailsPage.onc_.guid()]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.disconnectNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'WiFi')
       sendChromeMetricsAction('Options_NetworkDisconnectWifi');
     else if (detailsPage.type_ == 'VPN')
       sendChromeMetricsAction('Options_NetworkDisconnectVPN');
-    var guid = detailsPage.onc_.getActiveValue('GUID');
-    chrome.networkingPrivate.startDisconnect(guid);
+    chrome.networkingPrivate.startDisconnect(detailsPage.onc_.guid());
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.configureNetwork = function() {
     var detailsPage = DetailsInternetPage.getInstance();
-    chrome.send('configureNetwork', [detailsPage.servicePath_]);
+    chrome.send('configureNetwork', [detailsPage.onc_.guid()]);
     PageManager.closeOverlay();
   };
 
   DetailsInternetPage.activateFromDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     if (detailsPage.type_ == 'Cellular') {
-      chrome.send('activateNetwork', [detailsPage.servicePath_]);
+      chrome.send('activateNetwork', [detailsPage.onc_.guid()]);
     }
     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();
     var type = detailsPage.type_;
-    var servicePath = detailsPage.servicePath_;
     var oncData = new OncData({});
     var autoConnectCheckboxId = '';
     if (type == 'WiFi') {
       var preferredCheckbox =
           assertInstanceof($('prefer-network-wifi'), HTMLInputElement);
       if (!preferredCheckbox.hidden && !preferredCheckbox.disabled) {
         var kPreferredPriority = 1;
         var priority = preferredCheckbox.checked ? kPreferredPriority : 0;
         oncData.setProperty('Priority', priority);
         sendChromeMetricsAction('Options_NetworkSetPrefer');
@@ skipping 28 matching lines @@
     var ipConfig = detailsPage.getIpConfig_(nameServerType);
     var ipAddressType = ('IPAddress' in ipConfig) ? 'Static' : 'DHCP';
     var nameServersType = ('NameServers' in ipConfig) ? 'Static' : 'DHCP';
     oncData.setProperty('IPAddressConfigType', ipAddressType);
     oncData.setProperty('NameServersConfigType', nameServersType);
     oncData.setProperty('StaticIPConfig', ipConfig);
 
     var data = oncData.getData();
     if (Object.keys(data).length > 0) {
       // TODO(stevenjb): Only set changed properties.
-      // TODO(stevenjb): chrome.networkingPrivate.setProperties
-      chrome.send('setProperties', [servicePath, data]);
+      chrome.networkingPrivate.setProperties(detailsPage.onc_.guid(), data);
     }
 
     PageManager.closeOverlay();
   };
 
   /**
    * Event handler called when the name server type changes.
    * @param {string} type The selected name sever type, 'automatic', 'google',
    *                      or 'user'.
    */
@@ skipping 32 matching lines @@
   /**
    * 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_)
+    if (oncData.GUID != detailsPage.onc_.guid())
       return;
 
     // Update our cached data object.
     detailsPage.onc_ = new OncData(oncData);
 
     detailsPage.populateHeader_();
     detailsPage.updateConnectionButtonVisibilty_();
     detailsPage.updateDetails_();
   };
 
   /**
    * 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.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_();
 
     // TODO(stevenjb): Some of the setup below should be moved to
     // updateDetails_() so that updates are reflected in the UI.
 
     // Only show proxy for remembered networks.
     var remembered = onc.getSource() != 'None';
     if (remembered) {
       detailsPage.showProxy_ = true;
       // Inform Chrome which network to use for proxy configuration.
-      chrome.send('selectNetwork', [detailsPage.servicePath_]);
+      chrome.send('selectNetwork', [detailsPage.onc_.guid()]);
     } else {
       detailsPage.showProxy_ = false;
     }
 
     $('web-proxy-auto-discovery').hidden = true;
 
     var restricted = onc.getActiveValue('RestrictedConnectivity');
     var restrictedString = loadTimeData.getString(
         restricted ? 'restrictedYes' : 'restrictedNo');
 
@@ skipping 244 matching lines @@
             var option = document.createElement('option');
             option.textContent = supportedCarriers[c2];
             carrierSelector.add(option);
           }
           carrierSelector.selectedIndex = currentCarrierIndex;
         }
       }
       if (currentCarrierIndex == -1)
         $('service-name').textContent = networkName;
 
+      // TODO(stevenjb): Ideally many of these should be localized.
       $('network-technology').textContent =
           onc.getActiveValue('Cellular.NetworkTechnology');
       $('roaming-state').textContent =
           onc.getTranslatedValue('Cellular.RoamingState');
       $('cellular-restricted-connectivity').textContent = restrictedString;
-      // 'errorMessage' is a non ONC property added by Chrome.
-      $('error-state').textContent = onc.getActiveValue('errorMessage');
+      $('error-state').textContent = onc.getActiveValue('ErrorState');
       $('manufacturer').textContent =
           onc.getActiveValue('Cellular.Manufacturer');
       $('model-id').textContent = onc.getActiveValue('Cellular.ModelID');
       $('firmware-revision').textContent =
           onc.getActiveValue('Cellular.FirmwareRevision');
       $('hardware-revision').textContent =
           onc.getActiveValue('Cellular.HardwareRevision');
       $('mdn').textContent = onc.getActiveValue('Cellular.MDN');
 
       // Show ServingOperator properties only if available.
@@ skipping 99 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
   };
 });