Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1747)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java

Issue 1418473005: Add a dialog UI for Data Use accounting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@freighterSnackbar
Patch Set: adding OWNERS back Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
index 031c06741a1f2fc346f31ee4ab5b8290dc19a608..08e4aa38bf226ef0941733f2105c864180fae40b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateImpl.java
@@ -8,6 +8,7 @@ import org.chromium.base.VisibleForTesting;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ChromeActivity;
import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.datausage.DataUseTabUIManager;
import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult;
import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
@@ -20,7 +21,8 @@ import org.chromium.content_public.common.ConsoleMessageLevel;
/**
* Class that controls navigations and allows to intercept them. It is used on Android to 'convert'
- * certain navigations to Intents to 3rd party applications.
+ * certain navigations to Intents to 3rd party applications and to "pause" navigations when data use
+ * tracking has ended.
*/
public class InterceptNavigationDelegateImpl implements InterceptNavigationDelegate {
private final ChromeActivity mActivity;
@@ -106,8 +108,7 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
.setShouldCloseContentsOnOverrideUrlLoadingAndLaunchIntent(shouldCloseTab
&& navigationParams.isMainFrame)
.build();
- ExternalNavigationHandler.OverrideUrlLoadingResult result =
- mExternalNavHandler.shouldOverrideUrlLoading(params);
+ OverrideUrlLoadingResult result = mExternalNavHandler.shouldOverrideUrlLoading(params);
mLastOverrideUrlLoadingResult = result;
switch (result) {
case OVERRIDE_WITH_EXTERNAL_INTENT:
@@ -130,7 +131,8 @@ public class InterceptNavigationDelegateImpl implements InterceptNavigationDeleg
logBlockedNavigationToDevToolsConsole(url);
return true;
}
- return false;
+ return DataUseTabUIManager.shouldOverrideUrlLoading(mActivity, mTab, url,
+ navigationParams.pageTransitionType, navigationParams.referrer);
}
}

Powered by Google App Engine
This is Rietveld 408576698