Show search engine promo dialog for special locale

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 bb500abb1bb367cf6b7ebac674c674b1b99cf1f0..64e4129a4704dc392071e4ac1ca8451fe918b267 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -62,6 +62,7 @@ import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
 import org.chromium.chrome.browser.incognito.IncognitoNotificationManager;
 import org.chromium.chrome.browser.infobar.DataReductionPromoInfoBar;
+import org.chromium.chrome.browser.locale.LocaleManager;
 import org.chromium.chrome.browser.metrics.ActivityStopMetrics;
 import org.chromium.chrome.browser.metrics.LaunchMetrics;
 import org.chromium.chrome.browser.metrics.StartupMetrics;
@@ -200,6 +201,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
 
     private Boolean mIsAccessibilityEnabled;
 
+    private LocaleManager mLocaleManager;
+
     /**
      * Keeps track of whether or not a specific tab was created based on the startup intent.
      */
@@ -345,6 +348,10 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
             int incognitoCount = TabWindowManager.getInstance().getIncognitoTabCount();
             if (incognitoCount == 0) IncognitoNotificationManager.dismissIncognitoNotification();
 
+            // LocaleManager can only function after the native library is loaded.
+            mLocaleManager = LocaleManager.getInstance();
+            mLocaleManager.showSearchEnginePromoIfNeeded(this);
+
             super.finishNativeInitialization();
         } finally {
             TraceEvent.end("ChromeTabbedActivity.finishNativeInitialization");
@@ -521,6 +528,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
                     // This assumes that the keyboard can not be seen at the same time as the
                     // newtab button on the toolbar.
                     getCurrentTabCreator().launchNTP();
+                    mLocaleManager.showSearchEnginePromoIfNeeded(ChromeTabbedActivity.this);
                 }
             };
             OnClickListener bookmarkClickHandler = new OnClickListener() {
@@ -660,6 +668,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
                     launchFirstRunExperience();
                 }
             }
+            mLocaleManager.showSearchEnginePromoIfNeeded(this);

[Maria, 2016/10/04 03:42:22]

this is a bit weird -- you launch it even if FRE didn't succeed -- seems like
this belongs only within the if() condition.

[Ian Wen, 2016/10/04 18:28:45]

Good point. Done.

             return true;
         }
         return false;
@@ -1023,6 +1032,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
             RecordUserAction.record("MobileMenuNewTab");
             RecordUserAction.record("MobileNewTabOpened");
             getTabCreator(false).launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI);
+            mLocaleManager.showSearchEnginePromoIfNeeded(this);
         } else if (id == R.id.new_incognito_tab_menu_id) {
             if (PrefServiceBridge.getInstance().isIncognitoModeEnabled()) {
                 getTabModelSelector().getModel(false).commitAllTabClosures();