Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(702)

Unified Diff: chrome/browser/resources/gaia_auth/background.js

Issue 418043002: Add test for showing confirmation dialog for unsecure signin (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added comments Created 6 years, 5 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
Index: chrome/browser/resources/gaia_auth/background.js
diff --git a/chrome/browser/resources/gaia_auth/background.js b/chrome/browser/resources/gaia_auth/background.js
index 3baafc2c332103425c7787c50207c86f61b67886..24392d58f9a0fdf9f0e32442bbc0c8d5166f8732 100644
--- a/chrome/browser/resources/gaia_auth/background.js
+++ b/chrome/browser/resources/gaia_auth/background.js
@@ -31,6 +31,8 @@ function BackgroundBridgeManager() {
}
BackgroundBridgeManager.prototype = {
+ CONTINUE_URL_BASE: 'chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik' +
+ '/success.html',
// Maps a tab id to its associated BackgroundBridge.
bridges_: {},
@@ -68,7 +70,7 @@ BackgroundBridgeManager.prototype = {
if (this.bridges_[details.tabId])
this.bridges_[details.tabId].onCompleted(details);
}.bind(this),
- {urls: ['*://*/*'], types: ['sub_frame']},
+ {urls: ['*://*/*', this.CONTINUE_URL_BASE + '*'], types: ['sub_frame']},
Roger Tawa OOO till Jul 10th 2014/07/28 14:27:50 Why append *?
guohui 2014/08/07 19:53:34 we need * to match any trailing URL parameters.
['responseHeaders']);
},
@@ -109,9 +111,6 @@ BackgroundBridge.prototype = {
isDesktopFlow_: false,
- // Continue URL that is set from main auth script.
- continueUrl_: null,
-
// Whether the extension is loaded in a constrained window.
// Set from main auth script.
isConstrainedWindow_: null,
@@ -193,7 +192,6 @@ BackgroundBridge.prototype = {
onInitDesktopFlow_: function(msg) {
this.isDesktopFlow_ = true;
this.gaiaUrl_ = msg.gaiaUrl;
- this.continueUrl_ = msg.continueUrl;
this.isConstrainedWindow_ = msg.isConstrainedWindow;
},
@@ -209,16 +207,15 @@ BackgroundBridge.prototype = {
if (!this.isDesktopFlow_ || details.parentFrameId <= 0)
return;
- var msg = null;
- if (this.continueUrl_ &&
- details.url.lastIndexOf(this.continueUrl_, 0) == 0) {
+ if (details.url.lastIndexOf(backgroundBridgeManager.CONTINUE_URL_BASE, 0) ==
+ 0) {
var skipForNow = false;
if (details.url.indexOf('ntp=1') >= 0)
skipForNow = true;
// TOOD(guohui): Show password confirmation UI.
var passwords = this.onGetScrapedPasswords_();
- msg = {
+ var msg = {
'name': 'completeLogin',
'email': this.email_,
'password': passwords[0],
@@ -235,7 +232,7 @@ BackgroundBridge.prototype = {
return;
}
}
- msg = {
+ var msg = {
'name': 'switchToFullTab',
'url': details.url
};

Powered by Google App Engine
This is Rietveld 408576698