Index: chrome/browser/ui/webui/signin/inline_login_handler_impl.cc |
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc |
index 2a12a78672bd45703b6ccd43ff8ba58f69aefdff..9722791a6066e677d44e57b3ca80651a3ad95893 100644 |
--- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc |
+++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc |
@@ -226,12 +226,13 @@ void InlineLoginHandlerImpl::DidCommitProvisionalLoadForFrame( |
if (render_frame_host != gaia_iframe) |
return; |
- // Loading any untrusted (e.g., HTTP) URLs in the privileged sign-in process |
Charlie Reis
2014/07/24 18:14:38
Looks like you're changing the actual fix. How do
guohui
2014/07/24 18:31:21
This CL changes the continue URL (from https://www
Charlie Reis
2014/07/24 18:47:11
Works for me, but please leave the explanatory com
guohui
2014/07/24 19:37:18
Done.
|
- // will require confirmation before the sign in takes effect. |
- if (url.spec() != url::kAboutBlankURL && |
- !gaia::IsGaiaSignonRealm(url.GetOrigin()) && |
- !signin::IsContinueUrlForWebBasedSigninFlow(url)) { |
- confirm_untrusted_signin_ = true; |
+ if (!url.is_empty()) { |
+ GURL origin(url.GetOrigin()); |
+ if (url.spec() != url::kAboutBlankURL && |
+ origin != kGaiaExtOrigin && |
+ !gaia::IsGaiaSignonRealm(origin)) { |
+ confirm_untrusted_signin_ = true; |
+ } |
} |
} |