Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java |
| index 9ad9364e163c8cb7784c301ac3af710546677c93..d580dc9de442a8a037bc8796614783192c46c66e 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunSignInProcessor.java |
| @@ -15,6 +15,8 @@ import org.chromium.base.ContextUtils; |
| import org.chromium.base.Log; |
| import org.chromium.base.VisibleForTesting; |
| import org.chromium.chrome.browser.ChromeSwitches; |
| +import org.chromium.chrome.browser.IntentHandler; |
| +import org.chromium.chrome.browser.IntentHandler.ExternalAppId; |
| import org.chromium.chrome.browser.preferences.PreferencesLauncher; |
| import org.chromium.chrome.browser.signin.AccountManagementFragment; |
| import org.chromium.chrome.browser.signin.SigninManager; |
| @@ -63,6 +65,15 @@ public final class FirstRunSignInProcessor { |
| || (!firstRunFlowComplete && ToSAckedReceiver.checkAnyUserHasSeenToS(activity))) { |
| return; |
| } |
| + |
| + // Skip sign in if Chrome is neighter started via Chrome icon nor GSA (Google Search App). |
|
Bernhard Bauer
2016/06/16 16:35:36
Nit: "neither"?
gogerald1
2016/06/16 18:59:20
Done.
|
| + if (!TextUtils.equals(activity.getIntent().getAction(), Intent.ACTION_MAIN) |
| + && IntentHandler.determineExternalIntentSource( |
| + activity.getPackageName(), activity.getIntent()) |
| + != ExternalAppId.GSA) { |
| + return; |
| + } |
| + |
| // Otherwise, force trigger the FRE. |
| if (!firstRunFlowComplete) { |
| requestToFireIntentAndFinish(activity); |