Kick incognito tabs from CCTs to tabbed mode.

chrome/android/java/src/org/chromium/chrome/browser/multiwindow/MultiWindowUtils.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.multiwindow;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.ActivityManager.AppTask;
@@ skipping 13 matching lines @@
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.util.IntentUtils;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import javax.annotation.Nullable;
+
 /**
  * Utilities for detecting multi-window/multi-instance support.
  *
  * Thread-safe: This class may be accessed from any thread.
  */
 public class MultiWindowUtils implements ActivityStateListener {
 
     // TODO(twellington): replace this with Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT once we're building
     //                    against N.
     public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;
@@ skipping 105 matching lines @@
                     new WeakReference<ChromeTabbedActivity>((ChromeTabbedActivity) activity);
         }
     }
 
     /**
      * Determines the correct ChromeTabbedActivity class to use for an incoming intent.
      * @param intent The incoming intent that is starting ChromeTabbedActivity.
      * @param context The current Context, used to retrieve the ActivityManager system service.
      * @return The ChromeTabbedActivity to use for the incoming intent.
      */
-    public Class<? extends ChromeTabbedActivity> getTabbedActivityForIntent(Intent intent,
-            Context context) {
+    public Class<? extends ChromeTabbedActivity> getTabbedActivityForIntent(
+            @Nullable Intent intent, Context context) {
         // 1. Exit early if the build version doesn't support Android N+ multi-window mode or
         // ChromeTabbedActivity2 isn't running.
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M
                 || (mTabbedActivity2TaskRunning != null && !mTabbedActivity2TaskRunning)) {
             return ChromeTabbedActivity.class;
         }
 
         // 2. If the intent has a window id set, use that.
-        if (intent.hasExtra(IntentHandler.EXTRA_WINDOW_ID)) {
+        if (intent != null && IntentUtils.safeHasExtra(intent, IntentHandler.EXTRA_WINDOW_ID)) {
             int windowId = IntentUtils.safeGetIntExtra(intent, IntentHandler.EXTRA_WINDOW_ID, 0);
             if (windowId == 1) return ChromeTabbedActivity.class;
             if (windowId == 2) return ChromeTabbedActivity2.class;
         }
 
         // 3. If only one ChromeTabbedActivity is currently in Android recents, use it.
         boolean tabbed2TaskRunning = isActivityTaskInRecents(
                 ChromeTabbedActivity2.class.getName(), context);
 
         // Exit early if ChromeTabbedActivity2 isn't running.
@@ skipping 126 matching lines @@
         if (isLegacyMultiWindow(activity)) {
             if (TextUtils.equals(ChromeTabbedActivity.class.getName(),
                     intent.getComponent().getClassName())) {
                 intent.setClassName(activity, MultiInstanceChromeTabbedActivity.class.getName());
             }
             intent.setFlags(intent.getFlags()
                     & ~(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT));
         }
     }
 }