Chromium Code Reviews| 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..74c1c07e41b84b975edd530f3b7abc0355369424 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,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
| int incognitoCount = TabWindowManager.getInstance().getIncognitoTabCount(); |
| if (incognitoCount == 0) IncognitoNotificationManager.dismissIncognitoNotification(); |
| + mLocaleManager = ((ChromeApplication) getApplication()).createLocaleManager(); |
| + mLocaleManager.showSearchEnginePromoIfNeeded(this); |
| + |
| super.finishNativeInitialization(); |
| } finally { |
| TraceEvent.end("ChromeTabbedActivity.finishNativeInitialization"); |
| @@ -521,6 +527,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); |
|
Maria
2016/10/01 00:00:46
Why do we want to do this? Seems like showing afte
Ian Wen
2016/10/03 17:05:37
It might take some time for the variation server t
|
| } |
| }; |
| OnClickListener bookmarkClickHandler = new OnClickListener() { |
| @@ -660,6 +667,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
| launchFirstRunExperience(); |
| } |
| } |
| + mLocaleManager.showSearchEnginePromoIfNeeded(this); |
| return true; |
| } |
| return false; |
| @@ -1023,6 +1031,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(); |
| @@ -1335,6 +1344,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode |
| mVrShellDelegate.destroyVrShell(); |
| } |
| + mLocaleManager.destroy(); |
| + |
| super.onDestroyInternal(); |
| } |