summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordzhioev <dzhioev@chromium.org>2015-10-26 16:06:28 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-26 23:07:57 +0000
commit87c86da703d22547857a54215eb95eb23563cf53 (patch)
tree79f1ea2016ac06b6451a1508100d1f8cd58d6d1c
parent35f15fe7cfaca472f83721ace780e07fe11ef23d (diff)
downloadchromium_src-87c86da703d22547857a54215eb95eb23563cf53.zip
chromium_src-87c86da703d22547857a54215eb95eb23563cf53.tar.gz
chromium_src-87c86da703d22547857a54215eb95eb23563cf53.tar.bz2
Define GAIA frames statically instead of dynamic adding.
There were some problems with statically defined <webview>s when we started to use <webview> for sign in. It seems that these problem are gone now. BUG=none NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1419233004 Cr-Commit-Position: refs/heads/master@{#356164}
-rw-r--r--chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.css1
-rw-r--r--chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html3
-rw-r--r--chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js6
-rw-r--r--chrome/browser/resources/chromeos/login/screen_gaia_signin.html1
-rw-r--r--chrome/browser/resources/chromeos/login/screen_gaia_signin.js10
5 files changed, 6 insertions, 15 deletions
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.css b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.css
index 57cd66a..4199dc4 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.css
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.css
@@ -42,7 +42,6 @@
width: 100%;
}
-#oauth-enroll-auth-view-container,
#oauth-enroll-auth-view {
display: block;
height: 100%;
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html
index 9b4d8aa..d6612dc 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.html
@@ -7,7 +7,8 @@
<div id="oauth-enrollment" class="step no-logo hidden" hidden>
<div id="oauth-enroll-step-contents">
<div id="oauth-enroll-step-signin">
- <div id="oauth-enroll-auth-view-container"></div>
+ <webview id="oauth-enroll-auth-view" name="oauth-enroll-auth-view">
+ </webview>
</div>
<div id="oauth-enroll-step-error" role="alert">
<notification-card id="oauth-enroll-error-card" type="fail"
diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
index b643f2c..e46a345 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js
@@ -54,10 +54,8 @@ login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
/** @override */
decorate: function() {
- var webview = document.createElement('webview');
- webview.id = webview.name = 'oauth-enroll-auth-view';
- $('oauth-enroll-auth-view-container').appendChild(webview);
- this.authenticator_ = new cr.login.Authenticator(webview);
+ this.authenticator_ =
+ new cr.login.Authenticator($('oauth-enroll-auth-view'));
this.authenticator_.addEventListener('ready',
(function() {
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
index 3878539..a1a09d2 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.html
@@ -4,6 +4,7 @@
aria-live="polite" hidden>
<div class="step-contents">
<div id="gaia-signin-form-container">
+ <webview id="signin-frame" name="signin-frame" hidden></webview>
<offline-gaia id="offline-gaia" class="fit" hidden></offline-gaia>
</div>
</div>
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
index 7086ff3..a8dd3f3 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -138,18 +138,10 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
/** @override */
decorate: function() {
- // Create webview.
- // TODO(dzhioev): check if we can get rid of dynamic creation.
- var webview = this.ownerDocument.createElement('webview');
- webview.id = 'signin-frame';
- webview.name = 'signin-frame';
- webview.hidden = true;
- $('gaia-signin-form-container').insertBefore(webview, $('offline-gaia'));
-
$('offline-gaia').addEventListener('authCompleted',
this.onAuthCompletedMessage_.bind(this));
- this.gaiaAuthHost_ = new cr.login.GaiaAuthHost(webview);
+ this.gaiaAuthHost_ = new cr.login.GaiaAuthHost($('signin-frame'));
this.gaiaAuthHost_.addEventListener(
'ready', this.onAuthReady_.bind(this));
this.gaiaAuthHost_.addEventListener(