Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java |
index b5ac2c5124d3513f42b566a0db482eea8dc1bbaa..4ae0ebd744f4952af411c038673abe41b6af61a7 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java |
@@ -75,8 +75,9 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir |
public static final String EXTRA_FINISH_ON_TOUCH_OUTSIDE = "Extra.FreFinishOnTouchOutside"; |
static final String SHOW_WELCOME_PAGE = "ShowWelcome"; |
- static final String SHOW_SIGNIN_PAGE = "ShowSignIn"; |
static final String SHOW_DATA_REDUCTION_PAGE = "ShowDataReduction"; |
+ static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage"; |
+ static final String SHOW_SIGNIN_PAGE = "ShowSignIn"; |
static final String POST_NATIVE_SETUP_NEEDED = "PostNativeSetupNeeded"; |
@@ -105,7 +106,8 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir |
private static final int FRE_PROGRESS_SIGNIN_SHOWN = 3; |
private static final int FRE_PROGRESS_COMPLETED_SIGNED_IN = 4; |
private static final int FRE_PROGRESS_COMPLETED_NOT_SIGNED_IN = 5; |
- private static final int FRE_PROGRESS_MAX = 6; |
+ private static final int FRE_PROGRESS_DEFAULT_SEARCH_ENGINE_SHOWN = 6; |
+ private static final int FRE_PROGRESS_MAX = 7; |
private static final EnumeratedHistogramSample sMobileFreProgressMainIntentHistogram = |
new EnumeratedHistogramSample("MobileFre.Progress.MainIntent", FRE_PROGRESS_MAX); |
private static final EnumeratedHistogramSample sMobileFreProgressViewIntentHistogram = |
@@ -175,6 +177,13 @@ public class FirstRunActivity extends AsyncInitializationActivity implements Fir |
notifyAdapter = true; |
} |
+ // An optional page to select a default search engine. |
+ if (mFreProperties.getBoolean(SHOW_SEARCH_ENGINE_PAGE)) { |
+ mPages.add(pageOf(DefaultSearchEngineFirstRunFragment.class)); |
+ mFreProgressStates.add(FRE_PROGRESS_DEFAULT_SEARCH_ENGINE_SHOWN); |
+ notifyAdapter = true; |
+ } |
+ |
// An optional sign-in page. |
if (mFreProperties.getBoolean(SHOW_SIGNIN_PAGE)) { |
mPages.add(pageOf(AccountFirstRunFragment.class)); |