chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js - Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 7 months 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/resources/chromeos/gaia_auth/manifest_test.json ('k') | chrome/browser/resources/chromeos/login/screen_gaia_signin.js » ('j') | chrome/browser/resources/gaia_auth/test/content.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

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 877713063aeaacf62d30e3ec2f6d2d1bea588aad..2c0a6df0e63aed791ccdf859d1d045818b7e4cb3 100644

--- a/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

+++ b/chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js

@@ -184,8 +184,9 @@ cr.define('oobe', function() {

onBeforeShow: function(data) {

var url = data.signin_url;

- if (data.gaiaOrigin)

- url += '?gaiaOrigin=' + encodeURIComponent(data.gaiaOrigin);

+ url += '?gaiaOrigin=' + encodeURIComponent(data.gaiaOrigin);

+ if (data.gaiaUrlBase)

+ url += '&gaiaUrlPath=' + encodeURIComponent(data.gaiaUrlPath);

if (data.test_email) {

url += '&test_email=' + encodeURIComponent(data.test_email);

url += '&test_password=' + encodeURIComponent(data.test_password);