Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
index c4051e13f4037e7c6a7b9644bd9722cd142f46d8..4d3ae9767c561b18f65c38fdcd31a1ce388a0a94 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -85,6 +85,7 @@ import org.chromium.chrome.browser.gsa.GSAServiceClient; |
import org.chromium.chrome.browser.gsa.GSAState; |
import org.chromium.chrome.browser.help.HelpAndFeedback; |
import org.chromium.chrome.browser.infobar.InfoBarContainer; |
+import org.chromium.chrome.browser.infobar.TabbedModeOptInInfoBarDelegate; |
import org.chromium.chrome.browser.init.AsyncInitializationActivity; |
import org.chromium.chrome.browser.metrics.LaunchMetrics; |
import org.chromium.chrome.browser.metrics.StartupMetrics; |
@@ -188,6 +189,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
private ContextReporter mContextReporter; |
protected GSAServiceClient mGSAServiceClient; |
+ private boolean mIsSessionStartedWithThisActivity; |
+ private boolean mIsShowingTabbedModeOptInInfoBarAttempted = false; |
gone
2015/11/17 23:18:16
don't bother initializing to false; get rid of the
Kibeom Kim (inactive)
2015/11/20 11:44:14
Done.
|
private boolean mPartnerBrowserRefreshNeeded = false; |
protected IntentHandler mIntentHandler; |
@@ -464,6 +467,12 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(tabModelSelector) { |
@Override |
public void onPageLoadStarted(Tab tab, String url) { |
+ if (mIsSessionStartedWithThisActivity |
+ && !mIsShowingTabbedModeOptInInfoBarAttempted) { |
+ mIsShowingTabbedModeOptInInfoBarAttempted = true; |
+ TabbedModeOptInInfoBarDelegate.showIfNecessary(ChromeActivity.this); |
+ } |
+ |
if (DataUseTabUIManager.checkDataUseTrackingStarted(tab)) { |
mDataUseSnackbarController.showDataUseTrackingStartedBar(); |
} else if (DataUseTabUIManager.checkDataUseTrackingEnded(tab) |
@@ -551,7 +560,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
@Override |
public void onStartWithNative() { |
super.onStartWithNative(); |
- getChromeApplication().onStartWithNative(); |
+ mIsSessionStartedWithThisActivity = getChromeApplication().onStartWithNative(); |
Tab tab = getActivityTab(); |
if (tab != null) tab.onActivityStart(); |
FeatureUtilities.setDocumentModeEnabled(FeatureUtilities.isDocumentMode(this)); |