diff options
| author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 02:49:13 +0000 |
|---|---|---|
| committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 02:49:13 +0000 |
| commit | ff373a3a658588390dff82708cd8fe3fa0b52519 (patch) | |
| tree | 04b606809ecca0aada6f7bacf2443f5561778bae | |
| parent | 7febd2daa9e8daa9669cd51324d750337c2eb780 (diff) | |
| download | chromium_src-ff373a3a658588390dff82708cd8fe3fa0b52519.zip chromium_src-ff373a3a658588390dff82708cd8fe3fa0b52519.tar.gz chromium_src-ff373a3a658588390dff82708cd8fe3fa0b52519.tar.bz2 | |
When signing in via the interstitial, there is no need to check for the
sign in process since the user will be shown a modal dialog confirming that
they want to sign in with the given account.
BUG=181167
Review URL: https://chromiumcodereview.appspot.com/12638017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187462 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/sync/one_click_signin_helper.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index d5b2607..b135d22 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -611,11 +611,13 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents, if (!manager) return false; - if (!manager->IsSigninProcess( + // Only allow the dedicated signin process to sign the user into + // Chrome without intervention, because it doesn't load any untrusted + // pages. In the interstitial case, since chrome will display a modal + // dialog, we don't need to make this check. + if (can_offer_for == CAN_OFFER_FOR_ALL && + !manager->IsSigninProcess( web_contents->GetRenderProcessHost()->GetID())) { - // We only allow the dedicated signin process to sign the user into - // Chrome without intervention, because it doesn't load any untrusted - // pages. return false; } |