Activation process improvements

chrome/browser/resources/mobile_setup.js

 // Copyright (c) 2010 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('mobile', function() {
 
   function MobileSetup() {
   }
 
   cr.addSingletonGetter(MobileSetup);
 
-  MobileSetup.PLAN_ACTIVATION_LOADING = -1;
-  MobileSetup.PLAN_ACTIVATION_START = 0;
-  MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION = 1;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING = 2;
-  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT = 3;
-  MobileSetup.PLAN_ACTIVATION_DONE = 4;
-  MobileSetup.PLAN_ACTIVATION_ERROR = 5;
+  MobileSetup.PLAN_ACTIVATION_PAGE_LOADING            = -1;
+  MobileSetup.PLAN_ACTIVATION_START                   = 0;
+  MobileSetup.PLAN_ACTIVATION_TRYING_OTASP            = 1;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP_TRY  = 2;
+  MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION   = 3;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING            = 4;
+  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT         = 5;
+  MobileSetup.PLAN_ACTIVATION_DELAY_OTASP             = 6;
+  MobileSetup.PLAN_ACTIVATION_START_OTASP             = 7;
+  MobileSetup.PLAN_ACTIVATION_OTASP                   = 8;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP      = 9;
+  MobileSetup.PLAN_ACTIVATION_DONE                    = 10;
+  MobileSetup.PLAN_ACTIVATION_ERROR                   = 0xFF;
 
   MobileSetup.ACTIVATION_PAGE_URL =
     'file:///usr/share/chromeos-assets/mobile/activation.html';
 
   MobileSetup.localStrings_ = new LocalStrings();
 
   MobileSetup.prototype = {
     // Mobile device information.
     deviceInfo_: null,
     frameName_ : '',
@@ skipping 32 matching lines @@
           $('auxHeader').textContent = '';
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
           $('canvas').classList.add('hidden');
           $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
         }
       });
 
-      this.changeState_(MobileSetup.PLAN_ACTIVATION_LOADING);
+      this.changeState_({state: MobileSetup.PLAN_ACTIVATION_PAGE_LOADING});
       setInterval(mobile.MobileSetup.drawProgress, 100);
       // Kick off activation process.
       chrome.send('startActivation', []);
     },
 
     loadPaymentFrame_: function(deviceInfo) {
       if (deviceInfo) {
         this.deviceInfo_ = deviceInfo;
 
         $(this.frameName_).contentWindow.location.href =
@@ skipping 15 matching lines @@
       }
     },
 
     changeState_: function(deviceInfo) {
       var new_state = deviceInfo.state;
       if (this.state_ == new_state)
         return;
       var main = $('mainbody');
       // Map handler state to UX.
       switch(new_state) {
-        case MobileSetup.PLAN_ACTIVATION_LOADING:
+        case MobileSetup.PLAN_ACTIVATION_PAGE_LOADING:
         case MobileSetup.PLAN_ACTIVATION_START:
+        case MobileSetup.PLAN_ACTIVATION_DELAY_OTASP:
+        case MobileSetup.PLAN_ACTIVATION_START_OTASP:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
+        case MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP_TRY:
+        case MobileSetup.PLAN_ACTIVATION_RECONNECTING_OTASP:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('connecting_header');
           $('auxHeader').textContent =
               MobileSetup.localStrings_.getString('please_wait');
           $('errorMessage').textContent = '';
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
           $('canvas').classList.remove('hidden');
           $('carrierPage').classList.remove('hidden');
           break;
+        case MobileSetup.PLAN_ACTIVATION_TRYING_OTASP:
         case MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION:
+        case MobileSetup.PLAN_ACTIVATION_OTASP:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('activating_header');
           $('auxHeader').textContent =
               MobileSetup.localStrings_.getString('please_wait');
           $('errorMessage').textContent = '';
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
           $('canvas').classList.remove('hidden');
@@ skipping 104 matching lines @@
         mobile.MobileSetup.ACTIVATION_PAGE_URL);
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
 
 });