[Sync] Add support for identifying tabbed activites

chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
index 1134322623d8b7b1302330a7c055748d82e7ce3d..55c233376bd7d9b0bd13cfc6ed9867edcaf4c582 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelSelectorImpl.java
@@ -40,6 +40,10 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
 
     private boolean mIsUndoSupported;
 
+    // Whether the Activity that owns that TabModelSelector is tabbed or not.
+    // Used by sync to determine how to handle restore on cold start.
+    private boolean mIsTabbedActivityForSync;
+
     private final TabModelOrderController mOrderController;
 
     private OverviewModeBehavior mOverviewModeBehavior;
@@ -61,7 +65,7 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
      * @param supportUndo Whether a tab closure can be undone.
      */
     public TabModelSelectorImpl(Activity activity, TabCreatorManager tabCreatorManager,
-            TabPersistencePolicy persistencePolicy, boolean supportUndo) {
+            TabPersistencePolicy persistencePolicy, boolean supportUndo, boolean isTabbedActivity) {
         super();
         mTabCreatorManager = tabCreatorManager;
         mUma = new TabModelSelectorUma(activity);
@@ -73,6 +77,7 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
             }
         };
         mIsUndoSupported = supportUndo;
+        mIsTabbedActivityForSync = isTabbedActivity;
         mTabSaver = new TabPersistentStore(
                 persistencePolicy, this, mTabCreatorManager, persistentStoreObserver);
         mOrderController = new TabModelOrderController(this);
@@ -128,8 +133,9 @@ public class TabModelSelectorImpl extends TabModelSelectorBase implements TabMod
                 (ChromeTabCreator) mTabCreatorManager.getTabCreator(false);
         ChromeTabCreator incognitoTabCreator =
                 (ChromeTabCreator) mTabCreatorManager.getTabCreator(true);
-        TabModelImpl normalModel = new TabModelImpl(false, regularTabCreator, incognitoTabCreator,
-                mUma, mOrderController, mTabContentManager, mTabSaver, this, mIsUndoSupported);
+        TabModelImpl normalModel = new TabModelImpl(false, mIsTabbedActivityForSync,
+                regularTabCreator, incognitoTabCreator, mUma, mOrderController, mTabContentManager,
+                mTabSaver, this, mIsUndoSupported);
         TabModel incognitoModel = new IncognitoTabModel(new IncognitoTabModelImplCreator(
                 regularTabCreator, incognitoTabCreator, mUma, mOrderController,
                 mTabContentManager, mTabSaver, this));