Add the ability to activate for carriers that need to be directly activated.

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.
 
 cr.define('options.internet', function() {
   var OptionsPage = options.OptionsPage;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
   /** @const */ var IPAddressField = options.internet.IPAddressField;
 
   /**
@@ skipping 16 matching lines @@
    * @param {string} selector CSS selector for extracting a list of elements.
    * @param {bool} hidden New hidden value.
    */
   function updateHidden(selector, hidden) {
     var elements = cr.doc.querySelectorAll(selector);
     for (var i = 0, el; el = elements[i]; i++) {
       el.hidden = hidden;
     }
   }
 
+  /*
+   * Helper function to update the properties of the data object from the
+   * properties in the update object.
+   * @param {object} data object to update.
+   * @param {object} object containing the updated properties.
+   */
+  function updateDataObject(data, update) {
+    for (prop in update) {
+      if (prop in data) {

[Evan Stade, 2013/01/09 23:24:08]

no curlies

[rkc, 2013/01/09 23:34:35]

Done.

+        data[prop] = update[prop];
+      }
+    }
+  }
+
   /**
    * Monitor pref change of given element.
    * @param {Element} el Target element.
    */
   function observePrefsUI(el) {
     Preferences.getInstance().addEventListener(el.pref, handlePrefUpdate);
   }
 
   /**
    * UI pref change handler.
@@ skipping 438 matching lines @@
    * Changes the network carrier.
    */
   DetailsInternetPage.handleCarrierChanged = function() {
     var carrierSelector = $('select-carrier');
     var carrier = carrierSelector[carrierSelector.selectedIndex].textContent;
     DetailsInternetPage.showCarrierChangeSpinner(true);
     var data = $('connection-state').data;
     chrome.send('setCarrier', [data.servicePath, carrier]);
   };
 
-
   /**
    * Performs minimal initialization of the InternetDetails dialog in
    * preparation for showing proxy-setttings.
    */
   DetailsInternetPage.initializeProxySettings = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     detailsPage.initializePageContents_();
   };
 
   /**
@@ skipping 169 matching lines @@
         userDns.removeAttribute('selected');
         break;
       case 'user':
         automaticDns.removeAttribute('selected');
         googleDns.removeAttribute('selected');
         userDns.setAttribute('selected', '');
         break;
     }
   };
 
+  DetailsInternetPage.updateConnectionData = function(update) {
+    var detailsPage = DetailsInternetPage.getInstance();
+    if (!detailsPage.visible)
+      return;
+
+    var data = $('connection-state').data;
+    if (!data)
+      return;
+
+    // Update our cached data object.
+    updateDataObject(data, update);
+
+    detailsPage.deviceConnected = data.deviceConnected;
+    detailsPage.connecting = data.connecting;
+    detailsPage.connected = data.connected;
+    $('connection-state').textContent = data.connectionState;
+
+    $('details-internet-login').hidden = data.connected;
+    $('details-internet-login').disabled = data.disableConnectButton;
+
+    if (data.type == Constants.TYPE_WIFI) {
+      $('wifi-connection-state').textContent = data.connectionState;
+    } else if (data.type == Constants.TYPE_WIMAX) {
+      $('wimax-connection-state').textContent = data.connectionState;
+    } else if (data.type == Constants.TYPE_CELLULAR) {
+      $('activation-state').textContent = data.activationState;
+
+      $('buyplan-details').hidden = !data.showBuyButton;
+      $('view-account-details').hidden = !data.showViewAccountButton;
+
+      $('activate-details').hidden = !data.showActivateButton;
+      if (data.showActivateButton) {

[Evan Stade, 2013/01/09 23:24:08]

no curlies

[rkc, 2013/01/09 23:34:35]

Done.

+        $('details-internet-login').hidden = true;
+      }
+    }
+
+    if (data.type != Constants.TYPE_ETHERNET)
+      $('details-internet-disconnect').hidden = !data.connected;
+
+    $('connection-state').data = data;
+  }
+
   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 =
         loadTimeData.getString(statusKey);
     var typeKey = null;
@@ skipping 26 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;
+    $('details-internet-login').disabled = data.disableConnectButton;
     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;
     detailsPage.showStaticIPConfig = data.showStaticIPConfig;
@@ skipping 310 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
   };
 });