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

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

Issue 4311002: Fixed activation process.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 64445)
+++ chrome/browser/resources/mobile_setup.js (working copy)
@@ -13,7 +13,7 @@
MobileSetup.PLAN_ACTIVATION_LOADING = -1;
MobileSetup.PLAN_ACTIVATION_START = 0;
MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION = 1;
- MobileSetup.PLAN_ACTIVATION_ACTIVATING = 2;
+ MobileSetup.PLAN_ACTIVATION_RECONNECTING = 2;
MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT = 3;
MobileSetup.PLAN_ACTIVATION_DONE = 4;
MobileSetup.PLAN_ACTIVATION_ERROR = 5;
@@ -40,6 +40,7 @@
self.onMessageReceived_(e);
});
$('cheat').addEventListener('click', function(e) {
+ $('paymentForm').classList.add('hidden');
chrome.send('setTransactionStatus', ['OK']);
});
$(frame_name).addEventListener('load', function(e) {
@@ -75,6 +76,7 @@
if (e.data.type == 'requestDeviceInfoMsg') {
this.sendDeviceInfo_();
} else if (e.data.type == 'reportTransactionStatusMsg') {
+ $('paymentForm').classList.add('hidden');
chrome.send('setTransactionStatus', [e.data.status]);
}
},
@@ -97,7 +99,7 @@
$('systemStatus').classList.remove('hidden');
break;
case MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION:
- case MobileSetup.PLAN_ACTIVATION_ACTIVATING:
+ case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
$('statusHeader').textContent =
MobileSetup.localStrings_.getString('activating_header');
$('errorMessage').textContent = '';
@@ -111,7 +113,7 @@
break;
case MobileSetup.PLAN_ACTIVATION_DONE:
$('statusHeader').textContent = '';
- $('paymentForm').classList.add('hidden');
+ $('paymentForm').classList.remove('hidden');
$('finalMessage').classList.remove('hidden');
$('errorMessage').classList.add('hidden');
$('systemStatus').classList.add('hidden');
« 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