chrome/browser/resources/chromeos/login/screen_gaia_signin.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/screen_gaia_signin.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: rebase 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

« chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js ('K') | « chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js ('k') | chrome/browser/resources/component_extension_resources.grd » ('j') | chrome/browser/resources/component_extension_resources.grd » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js

index a90edb72c5a08bed34e693ca6128b113435a53c6..7fdf7438242310263c8f041db3164947a873b795 100644

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

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

@@ -188,6 +188,8 @@ cr.define('login', function() {

var params = [];

if (data.gaiaOrigin)

params.push('gaiaOrigin=' + encodeURIComponent(data.gaiaOrigin));

+ if (data.gaiaUrlPath)

+ params.push('gaiaUrlPath=' + encodeURIComponent(data.gaiaUrlPath));

if (data.hl)

params.push('hl=' + encodeURIComponent(data.hl));

if (data.localizedStrings) {

@@ -208,7 +210,7 @@ cr.define('login', function() {

url += '?' + params.join('&');

if (data.forceReload || this.extensionUrl_ != url) {

- console.log('Opening extension: ' + data.startUrl +

+ console.log('Opening extension: ' + data.url +

', opt_email=' + data.email);

this.error_ = 0;