ScreenCapture for Android phase1, part II

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.tabmodel;
 
 import android.app.Activity;
 import android.util.SparseArray;
 
 import org.chromium.base.ActivityState;
@@ skipping 140 matching lines @@
             if (tab != null && tab.isIncognito()) count++;
         }
         return count;
     }
 
     /**
      * @param tabId The ID of the tab in question.
      * @return Whether the given tab exists in any currently loaded selector.
      */
     public boolean tabExistsInAnySelector(int tabId) {
+        return getTabById(tabId) != null;
+    }
+
+    /**
+     * @param tabId The ID of the tab in question.
+     * @return Specified {@link Tab} or {@code null} if the {@link Tab} is not found.
+     */
+    public Tab getTabById(int tabId) {
         for (int i = 0; i < mSelectors.size(); i++) {
             TabModelSelector selector = mSelectors.get(i);
             if (selector != null) {
-                if (TabModelUtils.getTabById(selector.getModel(false), tabId) != null
-                        || TabModelUtils.getTabById(selector.getModel(true), tabId) != null) {
-                    return true;
-                }
+                final Tab tab = selector.getTabById(tabId);
+                if (tab != null) return tab;
             }
         }
 
-        // Account for tabs that were recently reparented and haven't been attached to new
-        // activities yet.
-        return AsyncTabParamsManager.hasParamsForTabId(tabId);
+        if (AsyncTabParamsManager.hasParamsForTabId(tabId)) {
+            return AsyncTabParamsManager.getAsyncTabParams().get(tabId).getTabToReparent();
+        }
+
+        return null;
     }
 
     @Override
     public void onActivityStateChange(Activity activity, int newState) {
         if (newState == ActivityState.DESTROYED && mAssignments.containsKey(activity)) {
             int index = mSelectors.indexOf(mAssignments.remove(activity));
             if (index >= 0) mSelectors.set(index, null);
             // TODO(dtrainor): Move TabModelSelector#destroy() calls here.
         }
     }
@@ skipping 18 matching lines @@
         @Override
         public TabModelSelector buildSelector(ChromeActivity activity, WindowAndroid windowAndroid,
                 int selectorIndex) {
             assert activity == windowAndroid.getActivity().get();
             TabPersistencePolicy persistencePolicy = new TabbedModeTabPersistencePolicy(
                     activity, selectorIndex);
             return new TabModelSelectorImpl(activity, persistencePolicy, windowAndroid, true);
         }
     }
 }