UI polish changes on cellular plan activation page....

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.ACTIVATION_PAGE_URL =
+    'file:///usr/share/chromeos-assets/mobile/activation.html';
+
   MobileSetup.localStrings_ = new LocalStrings();
 
   MobileSetup.prototype = {
     // Mobile device information.
     deviceInfo_: null,
     frameName_ : '',
     initialized_ : false,
     faked_transaction_ : false,
     // UI states.
     state_ : -1,
     STATE_UNKNOWN_: "unknown",
     STATE_CONNECTING_: "connecting",
     STATE_ERROR_: "error",
     STATE_PAYMENT_: "payment",
     STATE_ACTIVATING_: "activating",
     STATE_CONNECTED_: "connected",
 
-    initialize: function(frame_name) {
+    initialize: function(frame_name, carrierPage) {
       if (this.initialized_) {
         console.log('calling initialize() again?');
         return;
       }
       this.initialized_ = true;
       self = this;
       this.frameName_ = frame_name;
       window.addEventListener('message', function(e) {
           self.onMessageReceived_(e);
       });
       $('closeButton').addEventListener('click', function(e) {
           $('finalMessage').classList.add('hidden');
       });
+      $('carrierPage').contentWindow.location.href =
+          carrierPage;
       $(frame_name).addEventListener('load', function(e) {
         // Flip the visibility of the payment page only after the frame is
         // fully loaded.
         if (self.state_ == MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT) {
           $('statusHeader').textContent = '';
+          $('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);
       setInterval(mobile.MobileSetup.drawProgress, 100);
       // Kick off activation process.
       chrome.send('startActivation', []);
     },
 
@@ skipping 25 matching lines @@
       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_START:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
           $('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_INITIATING_ACTIVATION:
           $('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');
+          $('carrierPage').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('connecting_header');
+          $('auxHeader').textContent = '';
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
           $('canvas').classList.remove('hidden');
           this.loadPaymentFrame_(deviceInfo);
           break;
         case MobileSetup.PLAN_ACTIVATION_DONE:
           $('statusHeader').textContent = '';
+          $('auxHeader').textContent = '';
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
           $('canvas').classList.add('hidden');
+          $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
           $('finalMessage').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('error_header');
+          $('auxHeader').textContent = '';
           $('errorMessage').textContent = deviceInfo.error;
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
+          $('carrierPage').classList.add('hidden');
           $('canvas').classList.add('hidden');
           $('errorMessage').classList.remove('hidden');
           $('systemStatus').classList.remove('hidden');
           break;
       }
       this.state_ = new_state;
     },
 
     updateDeviceStatus_: function(deviceInfo) {
       this.changeState_(deviceInfo);
@@ skipping 52 matching lines @@
       ctx.fillStyle = "rgba(240, 30, 29, " + opacity + ")";
       ctx.fill();
     }
   };
 
   MobileSetup.deviceStateChanged = function(deviceInfo) {
     MobileSetup.getInstance().updateDeviceStatus_(deviceInfo);
   };
 
   MobileSetup.loadPage = function() {
-    mobile.MobileSetup.getInstance().initialize('paymentForm');
+    mobile.MobileSetup.getInstance().initialize('paymentForm',
+        mobile.MobileSetup.ACTIVATION_PAGE_URL);
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
 
 });