[Android] Show document mode opt-out InfoBar on selected devices.

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

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 98638061bee666076974889a6cf344e0bab4c191..23f81210ae1fd699ffa51f0f03f1a9fed89d2073 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
@@ -84,6 +84,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,7 +189,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
     private ContextReporter mContextReporter;
     protected GSAServiceClient mGSAServiceClient;
 
-    private boolean mPartnerBrowserRefreshNeeded = false;
+    private boolean mIsSessionStartedWithThisActivity;
+    private boolean mIsShowingTabbedModeOptInInfoBarAttempted;

[gone, 2015/11/20 19:26:14]

nit: this variable name is painful to read.

mAttemptedToShowWhateverInfoBar?

[Kibeom Kim (inactive), 2015/11/20 23:13:14]

Done.

+    private boolean mPartnerBrowserRefreshNeeded;
 
     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));