Use GUID instead of servicePath in network settings

chrome/browser/resources/options/chromeos/internet_detail.js

Index: chrome/browser/resources/options/chromeos/internet_detail.js
diff --git a/chrome/browser/resources/options/chromeos/internet_detail.js b/chrome/browser/resources/options/chromeos/internet_detail.js
index d3fd21b62a316a6527e639b2dccb2da2cda5d188..5bd88e613a907e6d5ce2080bba4aa2a372750b75 100644
--- a/chrome/browser/resources/options/chromeos/internet_detail.js
+++ b/chrome/browser/resources/options/chromeos/internet_detail.js
@@ -212,12 +212,13 @@ cr.define('options.internet', function() {
      * 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.

+        });
     },
 
     /**
@@ -251,7 +252,7 @@ cr.define('options.internet', function() {
 
       $('view-account-details').addEventListener('click', function(event) {
         chrome.send('showMorePlanInfo',
-                    [DetailsInternetPage.getInstance().servicePath_]);
+                    [DetailsInternetPage.getInstance().onc_.guid()]);
         PageManager.closeOverlay();
       });
 
@@ -908,8 +909,8 @@ cr.define('options.internet', function() {
       // 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());
     },
 
     /**
@@ -1054,8 +1055,7 @@ cr.define('options.internet', 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]);
   };
 
   /**
@@ -1135,7 +1135,7 @@ cr.define('options.internet', function() {
     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();
   };
 
@@ -1145,21 +1145,20 @@ cr.define('options.internet', function() {
       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();
   };
@@ -1171,7 +1170,6 @@ cr.define('options.internet', function() {
   DetailsInternetPage.setDetails = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     var type = detailsPage.type_;
-    var servicePath = detailsPage.servicePath_;
     var oncData = new OncData({});
     var autoConnectCheckboxId = '';
     if (type == 'WiFi') {
@@ -1220,8 +1218,7 @@ cr.define('options.internet', function() {
     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();
@@ -1274,7 +1271,7 @@ cr.define('options.internet', function() {
     if (!detailsPage.visible)
       return;
 
-    if (oncData.servicePath != detailsPage.servicePath_)
+    if (oncData.GUID != detailsPage.onc_.guid())
       return;
 
     // Update our cached data object.
@@ -1304,7 +1301,6 @@ cr.define('options.internet', function() {
     var onc = new OncData(oncData);
 
     var detailsPage = DetailsInternetPage.getInstance();
-    detailsPage.servicePath_ = oncData.servicePath;
     detailsPage.onc_ = onc;
     var type = onc.getActiveValue('Type');
     detailsPage.type_ = type;
@@ -1323,7 +1319,7 @@ cr.define('options.internet', function() {
     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;
     }
@@ -1588,13 +1584,13 @@ cr.define('options.internet', function() {
       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');