diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 05:52:14 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 05:52:14 +0000 |
| commit | 3f224b4440a33ba0b1b7ca32894cd374fb905946 (patch) | |
| tree | faa5e23fc4a9dbdd3708f988fdfe5509839c12f7 | |
| parent | 135f9f3b92182deb629a5d161d5b656eea9b0c15 (diff) | |
| download | chromium_src-3f224b4440a33ba0b1b7ca32894cd374fb905946.zip chromium_src-3f224b4440a33ba0b1b7ca32894cd374fb905946.tar.gz chromium_src-3f224b4440a33ba0b1b7ca32894cd374fb905946.tar.bz2 | |
Fix cases when 3G marketing message extension is not loading properly.
BUG=chromium-os:11870
TEST=make sure marketing message shows again on chrome:mobilesetup page
Review URL: http://codereview.chromium.org/6486006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74566 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/mobile_setup.html | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/mobile_setup.js | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/resources/mobile_setup.html b/chrome/browser/resources/mobile_setup.html index 0e39517..2424531 100644 --- a/chrome/browser/resources/mobile_setup.html +++ b/chrome/browser/resources/mobile_setup.html @@ -176,7 +176,8 @@ iframe { </tr> </tbody></table> </div> - <iframe id="carrierPage" frameborder="0"></iframe> + <iframe src="chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab/activation.html" + id="carrierPage" frameborder="0"></iframe> </div> </div> <div id="finalStatus" class="overlay hidden"> @@ -187,7 +188,7 @@ iframe { <div class="logo"></div> <div class="action-area button-strip"> <button id="closeButton" - i18n-content="close_button"></button> + i18n-content="close_button" class="hidden"></button> </div> </div> </div> diff --git a/chrome/browser/resources/mobile_setup.js b/chrome/browser/resources/mobile_setup.js index 6538329..b53b75c 100644 --- a/chrome/browser/resources/mobile_setup.js +++ b/chrome/browser/resources/mobile_setup.js @@ -59,8 +59,6 @@ cr.define('mobile', function() { $('closeButton').addEventListener('click', function(e) { $('finalStatus').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. @@ -165,6 +163,10 @@ cr.define('mobile', function() { $('paymentForm').classList.remove('hidden'); $('closeButton').classList.remove('hidden'); $('finalStatus').classList.remove('hidden'); + if (this.payment_shown_) + $('closeButton').classList.remove('hidden'); + else + $('closeButton').classList.add('hidden'); break; case MobileSetup.PLAN_ACTIVATION_ERROR: $('statusHeader').textContent = ''; |