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

Unified Diff: chrome/browser/ui/sync/one_click_signin_helper.cc

Issue 186133003: Suppresses OneClickSigninHelper on webUI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added logging Created 6 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/sync/one_click_signin_helper.cc
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 5607d1d93c6cba7c982f005c804489a1cc1e8c86..6fa6a577f5a8fc9f7b93adbc12538719314bdfce 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -1214,6 +1214,15 @@ void OneClickSigninHelper::DidStopLoading(
Profile::FromBrowserContext(contents->GetBrowserContext());
VLOG(1) << "OneClickSigninHelper::DidStopLoading: url=" << url.spec();
+ if (url.scheme() == content::kChromeUIScheme) {
+ // Suppresses OneClickSigninHelper on webUI pages to avoid inteference with
+ // inline signin flows.
+ VLOG(1) << "OneClickSigninHelper::DidStopLoading: suppressed for url="
+ << url.spec();
+ CleanTransientState();
+ return;
+ }
+
// If an error has already occured during the sign in flow, make sure to
// display it to the user and abort the process. Do this only for
// explicit sign ins.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698