diff options
author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 03:10:34 +0000 |
---|---|---|
committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 03:10:34 +0000 |
commit | b3f86fbbc97af49bd888da6f9e04cd64a5834fe5 (patch) | |
tree | 3b9f51df04c9a043ec4428304528882b1ba6bcac /chrome/browser/resources/mobile_setup.js | |
parent | 10fbcdd920de410c60b0022478271459292958f4 (diff) | |
download | chromium_src-b3f86fbbc97af49bd888da6f9e04cd64a5834fe5.zip chromium_src-b3f86fbbc97af49bd888da6f9e04cd64a5834fe5.tar.gz chromium_src-b3f86fbbc97af49bd888da6f9e04cd64a5834fe5.tar.bz2 |
Remaining fixes for activation process.
BUG=chromium-os:8400
TEST=make sure cellular connection can be activated from chrome:mobilesetup
Review URL: http://codereview.chromium.org/4333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/mobile_setup.js')
-rw-r--r-- | chrome/browser/resources/mobile_setup.js | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/browser/resources/mobile_setup.js b/chrome/browser/resources/mobile_setup.js index 65f7676..8428ee7 100644 --- a/chrome/browser/resources/mobile_setup.js +++ b/chrome/browser/resources/mobile_setup.js @@ -24,6 +24,8 @@ cr.define('mobile', function() { // Mobile device information. deviceInfo_: null, frameName_ : '', + initialized_ : false, + faked_transaction_ : false, // UI states. state_ : -1, STATE_UNKNOWN_: "unknown", @@ -34,14 +36,23 @@ cr.define('mobile', function() { STATE_CONNECTED_: "connected", initialize: function(frame_name) { + 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); }); $('cheat').addEventListener('click', function(e) { + console.log('calling setTransactionStatus from cheat.onclick'); + if (self.faked_transaction_) + return; $('paymentForm').classList.add('hidden'); chrome.send('setTransactionStatus', ['OK']); + self.faked_transaction_ = true; }); $(frame_name).addEventListener('load', function(e) { // Flip the visibility of the payment page only after the frame is @@ -76,6 +87,7 @@ cr.define('mobile', function() { if (e.data.type == 'requestDeviceInfoMsg') { this.sendDeviceInfo_(); } else if (e.data.type == 'reportTransactionStatusMsg') { + console.log('calling setTransactionStatus from onMessageReceived_'); $('paymentForm').classList.add('hidden'); chrome.send('setTransactionStatus', [e.data.status]); } |