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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java

Issue 1339613004: Add Data Reduction Proxy card to Clank FRE in EM (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments Created 5 years, 3 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
Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java
index 1df39700858eba24a4a15a4ebf0a59f0074a19a8..ff60f352b0f0c50a252fc037046e1aea3b08cdd5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/datareduction/DataReductionPromoScreen.java
@@ -18,6 +18,7 @@ import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.firstrun.DataReductionProxyFirstRunFragment;
import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
import org.chromium.ui.widget.Toast;
@@ -53,6 +54,10 @@ public class DataReductionPromoScreen extends Dialog implements View.OnClickList
// Showing the promo dialog in multiwindow mode is broken on Galaxy Note devices:
// http://crbug.com/354696. If we're in multiwindow mode, save the dialog for later.
if (MultiWindowUtils.getInstance().isMultiWindow(parentActivity)) return;
+ // Only show the promo if the FRE card was not shown.
aurimas (slooooooooow) 2015/09/24 20:59:10 If we treat them the same way, why do we have a di
megjablon 2015/09/24 23:40:34 Done.
+ if (DataReductionProxyFirstRunFragment.getDisplayedDataReductionFreCard(parentActivity)) {
+ return;
+ }
DataReductionPromoScreen promoScreen = new DataReductionPromoScreen(parentActivity);
promoScreen.setOnDismissListener(promoScreen);

Powered by Google App Engine
This is Rietveld 408576698