| 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.
|
|
|