From ecc34787a28eb482bb8ae1be8f42e2d2a6c7f5d5 Mon Sep 17 00:00:00 2001 From: Xiyuan Xia Date: Thu, 9 Apr 2015 21:39:24 -0700 Subject: [PATCH] Merge "sign-in: Don't inject into none http/https page." > BUG=473077 > > Review URL: https://codereview.chromium.org/1072643002 > > Cr-Commit-Position: refs/heads/master@{#324368} > (cherry picked from commit 5c35815d434a2baf00573a39fcb547e4901384d3) TBR=xiyuan@chromium.org Review URL: https://codereview.chromium.org/1055573004 Cr-Commit-Position: refs/branch-heads/2357@{#38} Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860} --- chrome/browser/resources/gaia_auth_host/saml_handler.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/chrome/browser/resources/gaia_auth_host/saml_handler.js b/chrome/browser/resources/gaia_auth_host/saml_handler.js index 20418d62cadfe..b41fad8597fba 100644 --- a/chrome/browser/resources/gaia_auth_host/saml_handler.js +++ b/chrome/browser/resources/gaia_auth_host/saml_handler.js @@ -266,6 +266,12 @@ cr.define('cr.login', function() { return; } + // Skip for none http/https url. + if (e.url.indexOf('https://') != 0 && + e.url.indexOf('http://') != 0) { + return; + } + this.isSamlPage_ = this.pendingIsSamlPage_; this.injectJs_(); },