chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java - Issue 1418473005: Add a dialog UI for Data Use accounting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.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

« no previous file with comments | « chrome/android/java/res/layout/data_use_dialog.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/datausage/DataUseTabUIManager.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

index db8abd88b68b42e1487d8939301fe18f821d36f3..bf7bc23659b316c79082dafb456de10ca3dd10c5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -459,11 +459,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity

mTabModelSelectorTabObserver = new TabModelSelectorTabObserver(tabModelSelector) {

@Override

public void onPageLoadStarted(Tab tab, String url) {

- if (DataUseTabUIManager.hasDataUseTrackingStarted(tab)) {

+ if (DataUseTabUIManager.checkDataUseTrackingStarted(tab)) {

mDataUseSnackbarController.showDataUseTrackingStartedBar();

- }

- if (DataUseTabUIManager.hasDataUseTrackingEnded(tab)) {

+ } else if (DataUseTabUIManager.checkDataUseTrackingEnded(tab)

+ && DataUseTabUIManager

+ .getOptedOutOfDataUseDialog(getApplicationContext())) {

mDataUseSnackbarController.showDataUseTrackingEndedBar();

}