NOT FOR REVIEW: Aura on Android

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

Index: chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
index 0fa84e26471f45ac76ca94b84fca36fb559e15e0..050f0cffbdb841f6b56039b0f867a25f8b7d57d1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
@@ -25,12 +25,12 @@ import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
-import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
-import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;
-import org.chromium.chrome.browser.omnibox.AutocompleteController;
+//import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
+//import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;
+//import org.chromium.chrome.browser.omnibox.AutocompleteController;
 import org.chromium.chrome.browser.search_engines.TemplateUrlService;
-import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
+//import org.chromium.chrome.browser.tab.Tab;
+//import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
 import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.common.Referrer;
@@ -289,26 +289,26 @@ public class IntentHandler {
      */
     public boolean onNewIntent(Context context, Intent intent) {
         assert intentHasValidUrl(intent);
-        String url = getUrlFromIntent(intent);
-        boolean hasUserGesture =
-                IntentWithGesturesHandler.getInstance().getUserGestureAndClear(intent);
-        TabOpenType tabOpenType = getTabOpenType(intent);
-        int tabIdToBringToFront = IntentUtils.safeGetIntExtra(
-                intent, TabOpenType.BRING_TAB_TO_FRONT.name(), Tab.INVALID_TAB_ID);
-        if (url == null && tabIdToBringToFront == Tab.INVALID_TAB_ID
-                && tabOpenType != TabOpenType.OPEN_NEW_INCOGNITO_TAB) {
+//        String url = getUrlFromIntent(intent);
+//        boolean hasUserGesture =
+//                IntentWithGesturesHandler.getInstance().getUserGestureAndClear(intent);
+//        TabOpenType tabOpenType = getTabOpenType(intent);
+//        int tabIdToBringToFront = IntentUtils.safeGetIntExtra(
+//                intent, TabOpenType.BRING_TAB_TO_FRONT.name(), Tab.INVALID_TAB_ID);
+//        if (url == null && tabIdToBringToFront == Tab.INVALID_TAB_ID
+//                && tabOpenType != TabOpenType.OPEN_NEW_INCOGNITO_TAB) {
             return handleWebSearchIntent(intent);
-        }
+//        }
 
-        String referrerUrl = getReferrerUrlIncludingExtraHeaders(intent, context);
-        String extraHeaders = getExtraHeadersFromIntent(intent);
-
-        // TODO(joth): Presumably this should check the action too.
-        mDelegate.processUrlViewIntent(url, referrerUrl, extraHeaders, tabOpenType,
-                IntentUtils.safeGetStringExtra(intent, Browser.EXTRA_APPLICATION_ID),
-                tabIdToBringToFront, hasUserGesture, intent);
-        recordExternalIntentSourceUMA(intent);
-        return true;
+//        String referrerUrl = getReferrerUrlIncludingExtraHeaders(intent, context);
+//        String extraHeaders = getExtraHeadersFromIntent(intent);
+//
+//        // TODO(joth): Presumably this should check the action too.
+//        mDelegate.processUrlViewIntent(url, referrerUrl, extraHeaders, tabOpenType,
+//                IntentUtils.safeGetStringExtra(intent, Browser.EXTRA_APPLICATION_ID),
+//                tabIdToBringToFront, hasUserGesture, intent);
+//        recordExternalIntentSourceUMA(intent);
+//        return true;
     }
 
     /**
@@ -421,7 +421,7 @@ public class IntentHandler {
         }
         if (results == null || results.size() == 0) return null;
         String query = results.get(0);
-        String url = AutocompleteController.nativeQualifyPartialURLQuery(query);
+        String url = null; // AutocompleteController.nativeQualifyPartialURLQuery(query);
         if (url == null) {
             List<String> urls = IntentUtils.safeGetStringArrayListExtra(
                     intent, RecognizerResultsIntent.EXTRA_VOICE_SEARCH_RESULT_URLS);
@@ -703,10 +703,10 @@ public class IntentHandler {
         if (isChromeToken(token, context)) {
             return true;
         }
-        if (ExternalAuthUtils.getInstance().isGoogleSigned(
-                    context.getPackageManager(), ApiCompatibilityUtils.getCreatorPackage(token))) {
-            return true;
-        }
+//        if (ExternalAuthUtils.getInstance().isGoogleSigned(
+//                    context.getPackageManager(), ApiCompatibilityUtils.getCreatorPackage(token))) {
+//            return true;
+//        }
         return false;
     }
 
@@ -725,33 +725,33 @@ public class IntentHandler {
      * The default behavior here is to open in a new tab.  If this is changed, ensure
      * intents with action NDEF_DISCOVERED (links beamed over NFC) are handled properly.
      */
-    private TabOpenType getTabOpenType(Intent intent) {
-        if (IntentUtils.safeGetBooleanExtra(
-                    intent, BookmarkUtils.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, false)) {
-            return TabOpenType.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB;
-        }
-
-        if (IntentUtils.safeGetBooleanExtra(intent, EXTRA_OPEN_NEW_INCOGNITO_TAB, false)) {
-            return TabOpenType.OPEN_NEW_INCOGNITO_TAB;
-        }
-
-        if (IntentUtils.safeGetIntExtra(intent, TabOpenType.BRING_TAB_TO_FRONT.name(),
-                    Tab.INVALID_TAB_ID) != Tab.INVALID_TAB_ID) {
-            return TabOpenType.BRING_TAB_TO_FRONT;
-        }
-
-        String appId = IntentUtils.safeGetStringExtra(intent, Browser.EXTRA_APPLICATION_ID);
-        // Due to users complaints, we are NOT reusing tabs for apps that do not specify an appId.
-        if (appId == null
-                || IntentUtils.safeGetBooleanExtra(intent, Browser.EXTRA_CREATE_NEW_TAB, false)) {
-            return TabOpenType.OPEN_NEW_TAB;
-        }
-
-        // Intents from chrome open in the same tab by default, all others only clobber
-        // tabs created by the same app.
-        return mPackageName.equals(appId) ? TabOpenType.CLOBBER_CURRENT_TAB
-                                          : TabOpenType.REUSE_APP_ID_MATCHING_TAB_ELSE_NEW_TAB;
-    }
+//    private TabOpenType getTabOpenType(Intent intent) {
+//        if (IntentUtils.safeGetBooleanExtra(
+//                    intent, BookmarkUtils.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB, false)) {
+//            return TabOpenType.REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB;
+//        }
+//
+//        if (IntentUtils.safeGetBooleanExtra(intent, EXTRA_OPEN_NEW_INCOGNITO_TAB, false)) {
+//            return TabOpenType.OPEN_NEW_INCOGNITO_TAB;
+//        }
+//
+//        if (IntentUtils.safeGetIntExtra(intent, TabOpenType.BRING_TAB_TO_FRONT.name(),
+//                    Tab.INVALID_TAB_ID) != Tab.INVALID_TAB_ID) {
+//            return TabOpenType.BRING_TAB_TO_FRONT;
+//        }
+//
+//        String appId = IntentUtils.safeGetStringExtra(intent, Browser.EXTRA_APPLICATION_ID);
+//        // Due to users complaints, we are NOT reusing tabs for apps that do not specify an appId.
+//        if (appId == null
+//                || IntentUtils.safeGetBooleanExtra(intent, Browser.EXTRA_CREATE_NEW_TAB, false)) {
+//            return TabOpenType.OPEN_NEW_TAB;
+//        }
+//
+//        // Intents from chrome open in the same tab by default, all others only clobber
+//        // tabs created by the same app.
+//        return mPackageName.equals(appId) ? TabOpenType.CLOBBER_CURRENT_TAB
+//                                          : TabOpenType.REUSE_APP_ID_MATCHING_TAB_ELSE_NEW_TAB;
+//    }
 
     private boolean isInvalidScheme(String scheme) {
         return scheme != null && (scheme.toLowerCase(Locale.US).equals("javascript")
@@ -807,9 +807,10 @@ public class IntentHandler {
     public static String getUrlFromIntent(Intent intent) {
         if (intent == null) return null;
 
-        String url = getUrlFromVoiceSearchResult(intent);
-        if (url == null) url = ActivityDelegate.getInitialUrlForDocument(intent);
-        if (url == null) url = intent.getDataString();
+//        String url = getUrlFromVoiceSearchResult(intent);
+//        if (url == null) url = ActivityDelegate.getInitialUrlForDocument(intent);
+//        if (url == null) url = intent.getDataString();
+        String url = intent.getDataString();
         if (url == null) return null;
 
         url = url.trim();