| 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 d36f6c6f7a3b5b43dea96a95fc2109c407962c51..04c45b4fbf99a8b4c506845563814b3fb7f295c1 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHandler.java
|
| @@ -26,6 +26,7 @@ import org.chromium.base.metrics.RecordHistogram;
|
| import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
|
| import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
|
| import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;
|
| +import org.chromium.chrome.browser.nfc.NfcIntentHandler;
|
| import org.chromium.chrome.browser.omnibox.AutocompleteController;
|
| import org.chromium.chrome.browser.search_engines.TemplateUrlService;
|
| import org.chromium.chrome.browser.tab.Tab;
|
| @@ -283,6 +284,10 @@ public class IntentHandler {
|
| * @return Whether the Intent was successfully handled.
|
| */
|
| boolean onNewIntent(Context context, Intent intent) {
|
| + if (NfcIntentHandler.handleIntent(context, intent)) {
|
| + return true;
|
| + }
|
| +
|
| assert intentHasValidUrl(intent);
|
| String url = getUrlFromIntent(intent);
|
| boolean hasUserGesture =
|
|
|