| Index: chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
|
| index 0045be7241e502c46c181c79735c2a8cd808dda6..3da782131ed5b007f9ac9a29b169132c418a912b 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
|
| @@ -28,7 +28,7 @@ import org.chromium.chrome.browser.ChromeActivity;
|
| import org.chromium.chrome.browser.IntentHandler;
|
| import org.chromium.chrome.browser.UrlUtilities;
|
| import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
|
| -import org.chromium.chrome.browser.tab.Tab;
|
| +//import org.chromium.chrome.browser.tab.Tab;
|
| import org.chromium.chrome.browser.util.FeatureUtilities;
|
| import org.chromium.chrome.browser.util.IntentUtils;
|
| import org.chromium.content_public.browser.LoadUrlParams;
|
| @@ -197,44 +197,44 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
|
| }
|
| }
|
|
|
| - @Override
|
| - public void startIncognitoIntent(final Intent intent, final String referrerUrl,
|
| - final String fallbackUrl, final Tab tab, final boolean needsToCloseTab) {
|
| - new AlertDialog.Builder(mActivity, R.style.AlertDialogTheme)
|
| - .setTitle(R.string.external_app_leave_incognito_warning_title)
|
| - .setMessage(R.string.external_app_leave_incognito_warning)
|
| - .setPositiveButton(R.string.ok, new OnClickListener() {
|
| - @Override
|
| - public void onClick(DialogInterface dialog, int which) {
|
| - startActivity(intent);
|
| - if (tab != null && !tab.isClosing() && tab.isInitialized()
|
| - && needsToCloseTab) {
|
| - closeTab(tab);
|
| - }
|
| - }
|
| - })
|
| - .setNegativeButton(R.string.cancel, new OnClickListener() {
|
| - @Override
|
| - public void onClick(DialogInterface dialog, int which) {
|
| - loadIntent(intent, referrerUrl, fallbackUrl, tab, needsToCloseTab, true);
|
| - }
|
| - })
|
| - .setOnCancelListener(new OnCancelListener() {
|
| - @Override
|
| - public void onCancel(DialogInterface dialog) {
|
| - loadIntent(intent, referrerUrl, fallbackUrl, tab, needsToCloseTab, true);
|
| - }
|
| - })
|
| - .show();
|
| - }
|
| +// @Override
|
| +// public void startIncognitoIntent(final Intent intent, final String referrerUrl,
|
| +// final String fallbackUrl, final Tab tab, final boolean needsToCloseTab) {
|
| +// new AlertDialog.Builder(mActivity, R.style.AlertDialogTheme)
|
| +// .setTitle(R.string.external_app_leave_incognito_warning_title)
|
| +// .setMessage(R.string.external_app_leave_incognito_warning)
|
| +// .setPositiveButton(R.string.ok, new OnClickListener() {
|
| +// @Override
|
| +// public void onClick(DialogInterface dialog, int which) {
|
| +// startActivity(intent);
|
| +// if (tab != null && !tab.isClosing() && tab.isInitialized()
|
| +// && needsToCloseTab) {
|
| +// closeTab(tab);
|
| +// }
|
| +// }
|
| +// })
|
| +// .setNegativeButton(R.string.cancel, new OnClickListener() {
|
| +// @Override
|
| +// public void onClick(DialogInterface dialog, int which) {
|
| +// loadIntent(intent, referrerUrl, fallbackUrl, tab, needsToCloseTab, true);
|
| +// }
|
| +// })
|
| +// .setOnCancelListener(new OnCancelListener() {
|
| +// @Override
|
| +// public void onCancel(DialogInterface dialog) {
|
| +// loadIntent(intent, referrerUrl, fallbackUrl, tab, needsToCloseTab, true);
|
| +// }
|
| +// })
|
| +// .show();
|
| +// }
|
|
|
| - @Override
|
| - public boolean shouldRequestFileAccess(Tab tab) {
|
| - // If the tab is null, then do not attempt to prompt for access.
|
| - if (tab == null) return false;
|
| -
|
| - return !tab.getWindowAndroid().hasFileAccess();
|
| - }
|
| +// @Override
|
| +// public boolean shouldRequestFileAccess(Tab tab) {
|
| +// // If the tab is null, then do not attempt to prompt for access.
|
| +// if (tab == null) return false;
|
| +//
|
| +// return !tab.getWindowAndroid().hasFileAccess();
|
| +// }
|
|
|
| @Override
|
| public void startFileIntent(final Intent intent, final String referrerUrl, final Tab tab,
|
| @@ -338,7 +338,7 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
|
| }
|
| }
|
|
|
| - private void closeTab(Tab tab) {
|
| - mActivity.getTabModelSelector().closeTab(tab);
|
| - }
|
| +// private void closeTab(Tab tab) {
|
| +// mActivity.getTabModelSelector().closeTab(tab);
|
| +// }
|
| }
|
|
|