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 9b431bb7611137481d569841612c07ce9346e108..96849b7903746b978e64dfd6b5aa65139c44b784 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -86,6 +86,7 @@ import org.chromium.chrome.browser.metrics.StartupMetrics; |
import org.chromium.chrome.browser.metrics.UmaSessionStats; |
import org.chromium.chrome.browser.metrics.UmaUtils; |
import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; |
+import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; |
import org.chromium.chrome.browser.nfc.BeamController; |
import org.chromium.chrome.browser.nfc.BeamProvider; |
import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; |
@@ -100,6 +101,7 @@ import org.chromium.chrome.browser.printing.PrintShareActivity; |
import org.chromium.chrome.browser.printing.TabPrinter; |
import org.chromium.chrome.browser.profiles.Profile; |
import org.chromium.chrome.browser.share.ShareHelper; |
+import org.chromium.chrome.browser.snackbar.DataReductionPromoSnackbarController; |
import org.chromium.chrome.browser.snackbar.DataUseSnackbarController; |
import org.chromium.chrome.browser.snackbar.SnackbarManager; |
import org.chromium.chrome.browser.snackbar.SnackbarManager.SnackbarManageable; |
@@ -206,6 +208,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
private ReaderModeManager mReaderModeManager; |
private SnackbarManager mSnackbarManager; |
private DataUseSnackbarController mDataUseSnackbarController; |
+ private DataReductionPromoSnackbarController mDataReductionPromoSnackbarController; |
private AppMenuPropertiesDelegate mAppMenuPropertiesDelegate; |
private AppMenuHandler mAppMenuHandler; |
private ToolbarManager mToolbarManager; |
@@ -524,6 +527,11 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
&& DataUseTabUIManager.checkAndResetDataUseTrackingEnded(tab)) { |
mDataUseSnackbarController.showDataUseTrackingEndedBar(); |
} |
+ if (DataReductionProxySettings.getInstance().isSnackbarPromoAllowed(tab.getUrl())) { |
+ mDataReductionPromoSnackbarController.maybeShowDataReductionPromoSnackbar( |
+ DataReductionProxySettings.getInstance() |
+ .getTotalHttpContentLengthSaved()); |
+ } |
gone
2016/10/13 01:03:10
What was the reasoning for putting all this non-pa
megjablon
2016/10/24 23:58:59
Done.
|
} |
@Override |
@@ -972,6 +980,9 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
DownloadManagerService.getDownloadManagerService( |
getApplicationContext()).onActivityLaunched(); |
+ mDataReductionPromoSnackbarController = new DataReductionPromoSnackbarController(this, |
gone
2016/10/13 01:03:10
Does this need to be created if the snackbar promo
megjablon
2016/10/24 23:59:00
Done.
|
+ getSnackbarManager()); |
+ |
super.finishNativeInitialization(); |
} |