Properly disabled wifi on cellular activation. Fixed few other activation and repayment related issues.

BUG=chromium-os:8724
TEST=none

Review URL: http://codereview.chromium.org/4540002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65224 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 29 insertions, 19 deletions

diff --git a/chrome/browser/resources/mobile_setup.js b/chrome/browser/resources/mobile_setup.js
index 8428ee7..16b02cf 100644
--- a/chrome/browser/resources/mobile_setup.js
+++ b/chrome/browser/resources/mobile_setup.js
@@ -57,11 +57,13 @@ cr.define('mobile', function() {
       $(frame_name).addEventListener('load', function(e) {
         // Flip the visibility of the payment page only after the frame is
         // fully loaded.
-        $('statusHeader').textContent = '';
-        $('paymentForm').classList.remove('hidden');
-        $('finalMessage').classList.add('hidden');
-        $('errorMessage').classList.add('hidden');
-        $('systemStatus').classList.add('hidden');
+        if (self.state_ == MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT) {
+          $('statusHeader').textContent = '';
+          $('finalMessage').classList.add('hidden');
+          $('errorMessage').classList.add('hidden');
+          $('systemStatus').classList.add('hidden');
+          $('paymentForm').classList.remove('hidden');
+        }
       });
 
       this.changeState_(MobileSetup.PLAN_ACTIVATION_LOADING);
@@ -121,14 +123,18 @@ cr.define('mobile', function() {
           $('systemStatus').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT:
+          $('paymentForm').classList.add('hidden');
+          $('finalMessage').classList.add('hidden');
+          $('errorMessage').classList.add('hidden');
+          $('systemStatus').classList.remove('hidden');
           this.loadPaymentFrame_(deviceInfo);
           break;
         case MobileSetup.PLAN_ACTIVATION_DONE:
           $('statusHeader').textContent = '';
-          $('paymentForm').classList.remove('hidden');
-          $('finalMessage').classList.remove('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
+          $('paymentForm').classList.remove('hidden');
+          $('finalMessage').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent =
diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html
index f738458..98c4b46 100644
--- a/chrome/browser/resources/options/chromeos_internet_detail.html
+++ b/chrome/browser/resources/options/chromeos_internet_detail.html
@@ -103,10 +103,6 @@
         </label>
       </div>
     </section>
-    <section>
-      <div><a id="customerSupport" target="_blank"
-              i18n-content="customerSupport"></a></div>
-    </section>
   </div>
   <div id="cellularConnTab" class="subpages-tab-contents cellular-details">
     <section id="cellularNetworkOptions">
diff --git a/chrome/browser/resources/options/chromeos_internet_network_element.js b/chrome/browser/resources/options/chromeos_internet_network_element.js
index 9df7617..bf58004 100644
--- a/chrome/browser/resources/options/chromeos_internet_network_element.js
+++ b/chrome/browser/resources/options/chromeos_internet_network_element.js
@@ -104,7 +104,8 @@ cr.define('options.internet', function() {
       connecting: network[5],
       iconURL: network[6],
       remembered: network[7],
-      activation_state: network[8]
+      activation_state: network[8],
+      restricted: network[9]
     };
     NetworkItem.decorate(el);
     return el;
@@ -183,12 +184,18 @@ cr.define('options.internet', function() {
       var buttonsDiv = this.ownerDocument.createElement('div');
       var self = this;
       if (!this.data.remembered) {
+        var no_plan =
+            this.data.networkType == NetworkItem.TYPE_CELLULAR &&
+            this.data.activation_state ==
+                NetworkItem.ACTIVATION_STATE_ACTIVATED &&
+            this.data.restricted &&
+            this.data.connected;
         var show_activate =
-          this.data.networkType == NetworkItem.TYPE_CELLULAR &&
-          this.data.activation_state !=
-              NetworkItem.ACTIVATION_STATE_ACTIVATED &&
-          this.data.activation_state !=
-              NetworkItem.ACTIVATION_STATE_ACTIVATING;
+          (this.data.networkType == NetworkItem.TYPE_CELLULAR &&
+           this.data.activation_state !=
+               NetworkItem.ACTIVATION_STATE_ACTIVATED &&
+           this.data.activation_state !=
+               NetworkItem.ACTIVATION_STATE_ACTIVATING);
 
         // Disconnect button if not ethernet and if cellular it should be
         // activated.
@@ -204,9 +211,10 @@ cr.define('options.internet', function() {
                }));
         }
         // Show [Activate] button for non-activated Cellular network.
-        if (show_activate) {
+        if (show_activate || no_plan) {
+          var button_name = no_plan ? 'buyplan_button' : 'activate_button';
           buttonsDiv.appendChild(
-              this.createButton_('activate_button', 'activate',
+              this.createButton_(button_name, 'activate',
                                  function(e) {
                 chrome.send('buttonClickCallback',
                             [String(self.data.networkType),