Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 50 insertions, 11 deletions

diff --git a/chrome/browser/resources/options/chromeos_internet_options.js b/chrome/browser/resources/options/chromeos_internet_options.js
index 59df059..1152cfd 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.js
+++ b/chrome/browser/resources/options/chromeos_internet_options.js
@@ -49,11 +49,11 @@ cr.define('options', function() {
       $('rememberedSection').hidden = (templateData.rememberedList.length == 0);
       InternetOptions.setupAttributes(templateData);
       $('detailsInternetDismiss').addEventListener('click', function(event) {
-        OptionsPage.closeOverlay();
+        InternetOptions.setDetails();
       });
       $('detailsInternetLogin').addEventListener('click', function(event) {
         InternetOptions.loginFromDetails();
-      });;
+      });
       $('activateDetails').addEventListener('click', function(event) {
         InternetOptions.activateFromDetails();
       });
@@ -128,12 +128,23 @@ cr.define('options', function() {
     var servicePath = data.servicePath;
     if (data.type == options.internet.Constants.TYPE_CELLULAR) {
       chrome.send('buttonClickCallback', [String(data.type),
-                                          servicePath,
+                                          String(servicePath),
                                           'activate']);
     }
     OptionsPage.closeOverlay();
   };
 
+  InternetOptions.setDetails = function () {
+    var data = $('inetAddress').data;
+    var servicePath = data.servicePath;
+    if (data.type == options.internet.Constants.TYPE_WIFI) {
+      chrome.send('setDetails',[String(servicePath),
+                                $('autoConnectNetwork').checked ?
+                                  "true" : "false"]);
+    }
+    OptionsPage.closeOverlay();
+  };
+
   InternetOptions.setupAttributes = function(data) {
     var buttons = $('wirelessButtons');
     if (data.wifiEnabled) {
@@ -213,17 +224,30 @@ cr.define('options', function() {
       page.setAttribute('nocellplan', true);
       page.removeAttribute('hascellplan');
     }
-    if (!data.needsPlan) {
+
+    if (!data.needsPlan)
       page.setAttribute('hasactiveplan', true);
-    } else {
+    else
       page.removeAttribute('hasactiveplan');
-    }
+
     if (data.activated) {
       page.setAttribute('activated', true);
     } else {
       page.removeAttribute('activated');
+      $('detailsInternetLogin').classList.add('hidden');
     }
 
+    // CSS selectors don't like me anymore, switching to classList
+    if (data.showBuyButton)
+      $('buyplanDetails').classList.remove('hidden');
+    else
+      $('buyplanDetails').classList.add('hidden');
+
+    if (data.showActivateButton)
+      $('activateDetails').classList.remove('hidden');
+    else
+      $('activateDetails').classList.add('hidden');
+
     // Nudge webkit so that it redraws the details overlay page.
     // See http://crosbug.com/9616 for details.
     // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=50176
@@ -239,11 +263,9 @@ cr.define('options', function() {
 
   InternetOptions.showDetailedInfo = function (data) {
     var page = $('detailsInternetPage');
-    if (data.connected) {
-      $('inetTitle').textContent = localStrings.getString('inetStatus');
-    } else {
-      $('inetTitle').textContent = localStrings.getString('inetConnect');
-    }
+    $('buyplanDetails').classList.add('hidden');
+    $('activateDetails').classList.add('hidden');
+    $('detailsInternetLogin').classList.add('hidden');
     if (data.connecting) {
       page.setAttribute('connecting', data.connecting);
     } else {
@@ -251,8 +273,11 @@ cr.define('options', function() {
     }
     if (data.connected) {
       page.setAttribute('connected', data.connected);
+      $('inetTitle').textContent = localStrings.getString('inetStatus');
     } else {
       page.removeAttribute('connected');
+      $('inetTitle').textContent = localStrings.getString('inetConnect');
+      $('detailsInternetLogin').classList.remove('hidden');
     }
     $('connectionState').textContent = data.connectionState;
     var address = $('inetAddress');
@@ -339,6 +364,20 @@ cr.define('options', function() {
         $('imsi').textContent = data.imsi;
         page.setAttribute('gsm', true);
       }
+
+      // CSS selectors don't like me anymore, switching to classList
+      if (data.showBuyButton)
+        $('buyplanDetails').classList.remove('hidden');
+      else
+        $('buyplanDetails').classList.add('hidden');
+
+      if (data.showActivateButton) {
+        $('activateDetails').classList.remove('hidden')
+        $('detailsInternetLogin').classList.add('hidden');
+      } else {
+        $('activateDetails').classList.add('hidden');
+      }
+
       page.removeAttribute('hascellplan');
       if (data.connected) {
         page.removeAttribute('nocellplan');