chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java - Issue 2005623002: Logic for the Data Saver InfoBar Promo

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/firstrun/FirstRunFlowSequencer.java

Issue 2005623002: Logic for the Data Saver InfoBar Promo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: missing returns Created 4 years, 6 months 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/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/infobar/DataReductionPromoInfoBar.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/firstrun/FirstRunFlowSequencer.java

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

index 3d2a9a5bb7fff697aa8c2770899c23152db56cd4..f3e99213b4880510448d21ee495ce28d0a8b95d6 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java

@@ -15,6 +15,7 @@ import org.chromium.base.CommandLine;

import org.chromium.base.FieldTrialList;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.browser.ChromeSwitches;

+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

import org.chromium.chrome.browser.preferences.PrefServiceBridge;

import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;

import org.chromium.chrome.browser.services.AndroidEduAndChildAccountHelper;

@@ -116,7 +117,8 @@ public abstract class FirstRunFlowSequencer {

}

protected boolean shouldShowDataReductionPage() {

- return FieldTrialList.findFullName("DataReductionProxyFREPromo").startsWith("Enabled");

+ return !DataReductionProxySettings.getInstance().isDataReductionProxyManaged()

+ && FieldTrialList.findFullName("DataReductionProxyFREPromo").startsWith("Enabled");

}

@VisibleForTesting