Commit 73878d0e authored by mnissler@chromium.org's avatar mnissler@chromium.org

CrOS OOBE: Load gaia login frame only after dialogArguments have been initialized.

If the gaia login frame is loaded right away when the main OOBE UI loads, there's no chance for the enrollment handler to set up chrome.dialogArguments, which gaia_login.js however requires to initialize correctly. So, defer loading of the gaia login frame to the point the enterprise enrollment screen actually gets shown.

BUG=chromium-os:18736
TEST=Enrollment triggered through the accelerator finally works.

Review URL: http://codereview.chromium.org/7550048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95808 0039d316-1c4b-4281-b951-d872f2087c98
parent 445bf2e8
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
</div> </div>
</div> </div>
<div id="enroll-login-form"> <div id="enroll-login-form">
<iframe id="gaia-local-login" scrolling="no" <iframe id="gaia-local-login" scrolling="no"></iframe>
src="chrome://oobe/gaialogin"></iframe>
</div> </div>
</div> </div>
<div id="enroll-confirmation-screen" hidden> <div id="enroll-confirmation-screen" hidden>
......
...@@ -36,6 +36,15 @@ cr.define('oobe', function() { ...@@ -36,6 +36,15 @@ cr.define('oobe', function() {
return localStrings.getString('loginHeader'); return localStrings.getString('loginHeader');
}, },
/**
* Event handler that is invoked just before the frame is shown.
* @param {object} data Screen init payload.
*/
onBeforeShow: function(data) {
// Reload the gaia frame.
$('gaia-local-login').src = 'chrome://oobe/gaialogin';
},
/** /**
* Buttons in oobe wizard's button strip. * Buttons in oobe wizard's button strip.
* @type {array} Array of Buttons. * @type {array} Array of Buttons.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment