[FRE] Change the First Run Experience launching behavior

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
index dfa556255b970d43a8dae5099930d8564fd59bab..ab497714f2b0d6550336bcf77856c596dea8ea14 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -168,6 +168,12 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
     public static final String INTENT_EXTRA_TEST_RENDER_PROCESS_LIMIT = "render_process_limit";
 
     /**
+     * Sending an intent with this extra sets the ChromeTabbedActivity to skip the First Run
+     * Experience.
+     */
+    public static final String SKIP_THE_FIRST_RUN_EXPERIENCE = "skip_the_first_run_experience";

[Bernhard Bauer, 2016/08/16 23:20:08]

Nit: I would actually use a more succinct style of wording for the constant name
and leave out the article, i.e. just SKIP_FIRST_RUN_EXPERIENCE. For comments the
article is definitely correct though!

[gogerald1, 2016/08/17 14:44:10]

Acknowledged.

+
+    /**
      * Sending an intent with this action to Chrome will cause it to close all tabs
      * (iff the --enable-test-intents command line flag is set). If a URL is supplied in the
      * intent data, this will be loaded and unaffected by the close all action.
@@ -957,8 +963,15 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
             return;
         }
 
+        if (getIntent() != null
+                && getIntent().getBooleanExtra(SKIP_THE_FIRST_RUN_EXPERIENCE, false)) {
+            return;
+        }
+
+        boolean fromChromeIcon = getIntent() != null
+                && TextUtils.equals(getIntent().getAction(), Intent.ACTION_MAIN);
         final Intent freIntent =
-                FirstRunFlowSequencer.checkIfFirstRunIsNecessary(this, getIntent());
+                FirstRunFlowSequencer.checkIfFirstRunIsNecessary(this, fromChromeIcon, false);
         if (freIntent == null) return;
 
         mIsOnFirstRun = true;