Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6912)

Unified Diff: chrome/browser/resources/mobile_setup.js

Issue 5861001: Activation process improvements (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/mobile_setup.js
===================================================================
--- chrome/browser/resources/mobile_setup.js (revision 71286)
+++ chrome/browser/resources/mobile_setup.js (working copy)
@@ -10,13 +10,19 @@
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';
@@ -69,7 +75,7 @@
}
});
- 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', []);
@@ -105,9 +111,13 @@
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 =
@@ -120,7 +130,9 @@
$('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 =
« no previous file with comments | « chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698