Index: chrome/android/java/src/org/chromium/chrome/browser/snackbar/LoFiBarPopupController.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/LoFiBarPopupController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/LoFiBarPopupController.java |
index ab85ceb1a0c5b6b8569071788317ea4ebc3a3d8c..20311b692d8ff00191c0da95784abc8e7bdad8d7 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/LoFiBarPopupController.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/LoFiBarPopupController.java |
@@ -23,6 +23,10 @@ import org.chromium.chrome.browser.tab.TabObserver; |
* When the load images button is clicked, it will reload the page without Lo-Fi. |
*/ |
public class LoFiBarPopupController implements SnackbarManager.SnackbarController { |
+ /** Snackbar types */ |
+ private static final int LOFI_SNACKBAR = 0; |
+ private static final int PREVIEW_SNACKBAR = 1; |
+ |
private static final int DEFAULT_LO_FI_SNACKBAR_SHOW_DURATION_MS = 6000; |
private final SnackbarManager mSnackbarManager; |
private final Context mContext; |
@@ -96,7 +100,7 @@ public class LoFiBarPopupController implements SnackbarManager.SnackbarControlle |
.getString(isPreview ? R.string.data_reduction_lo_fi_preview_snackbar_action |
: R.string.data_reduction_lo_fi_snackbar_action); |
mSnackbarManager.showSnackbar(Snackbar.make(message, this) |
- .setAction(buttonText, tab.getId()) |
+ .setAction(buttonText, isPreview ? PREVIEW_SNACKBAR : LOFI_SNACKBAR) |
.setDuration(DEFAULT_LO_FI_SNACKBAR_SHOW_DURATION_MS) |
.setForceDisplay()); |
DataReductionProxySettings.getInstance().incrementLoFiSnackbarShown(); |
@@ -117,7 +121,21 @@ public class LoFiBarPopupController implements SnackbarManager.SnackbarControlle |
@Override |
public void onAction(Object actionData) { |
mSnackbarManager.dismissSnackbars(this); |
- mTab.reloadDisableLoFi(); |
+ |
+ if (actionData == null) return; |
+ int snackbarType = (int) actionData; |
+ switch (snackbarType) { |
+ case PREVIEW_SNACKBAR: |
+ mTab.reloadDisableLoFi(); |
+ break; |
+ case LOFI_SNACKBAR: |
+ mTab.reloadLoFiImages(); |
+ break; |
+ default: |
+ assert false; |
+ break; |
+ } |
+ |
DataReductionProxySettings.getInstance().incrementLoFiUserRequestsForImages(); |
DataReductionProxyUma.dataReductionProxyLoFiUIAction( |
DataReductionProxyUma.ACTION_LOAD_IMAGES_SNACKBAR_CLICKED); |