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 e687991a3f51a73ad7955df335fec2aa7b815fe7..45ec94cd72e4de75e652c1235742d185e134ebfb 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java |
@@ -87,7 +87,6 @@ import org.chromium.chrome.browser.init.AsyncInitializationActivity; |
import org.chromium.chrome.browser.metrics.LaunchMetrics; |
import org.chromium.chrome.browser.metrics.StartupMetrics; |
import org.chromium.chrome.browser.metrics.UmaSessionStats; |
-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.OfflinePageUtils; |
@@ -462,6 +461,26 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
} |
/** |
+ * Displays a Lo-Fi snackbar for the given tab. If the tab is hidden, waits until it is visible |
+ * to show the snackbar. |
+ * @param tab The tab to show the snackbar on. |
+ */ |
+ public void showLoFiPopup(Tab tab) { |
newt (away)
2016/01/06 19:03:27
All the lo-fi snackbar logic should be moved into
megjablon
2016/01/07 21:22:05
Done.
|
+ if (tab.isHidden()) { |
+ TabObserver tabObserver = new EmptyTabObserver() { |
+ @Override |
+ public void onShown(Tab tab) { |
+ mLoFiBarPopupController.showLoFiBar(tab); |
+ tab.removeObserver(this); |
+ } |
+ }; |
+ tab.addObserver(tabObserver); |
+ return; |
+ } |
+ mLoFiBarPopupController.showLoFiBar(tab); |
+ } |
+ |
+ /** |
* Sets the {@link TabModelSelector} owned by this {@link ChromeActivity}. |
* @param tabModelSelector A {@link TabModelSelector} instance. |
*/ |
@@ -478,24 +497,6 @@ public abstract class ChromeActivity extends AsyncInitializationActivity |
&& DataUseTabUIManager.checkAndResetDataUseTrackingEnded(tab)) { |
mDataUseSnackbarController.showDataUseTrackingEndedBar(); |
} |
- |
- if (!tab.isNativePage() && !tab.isIncognito() |
- && DataReductionProxySettings.getInstance().wasLoFiModeActiveOnMainFrame() |
- && DataReductionProxySettings.getInstance().canUseDataReductionProxy( |
- tab.getUrl())) { |
- if (tab.isHidden()) { |
- TabObserver tabObserver = new EmptyTabObserver() { |
- @Override |
- public void onShown(Tab tab) { |
- mLoFiBarPopupController.showLoFiBar(tab); |
- tab.removeObserver(this); |
- } |
- }; |
- tab.addObserver(tabObserver); |
- return; |
- } |
- mLoFiBarPopupController.showLoFiBar(tab); |
- } |
} |
@Override |