diff options
12 files changed, 8 insertions, 71 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java index 62b21be..d8d4049 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/download/DownloadSnackbarController.java @@ -42,10 +42,6 @@ public class DownloadSnackbarController implements SnackbarManager.SnackbarContr public void onDismissNoAction(Object actionData) { } - @Override - public void onDismissForEachType(boolean isTimeout) { - } - /** * Called to display the download succeeded snackbar. * diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java index 8939208..65bb0b4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUndoController.java @@ -59,10 +59,6 @@ public class EnhancedBookmarkUndoController extends BookmarkModelObserver implem public void onDismissNoAction(Object actionData) { } - @Override - public void onDismissForEachType(boolean isTimeout) { - } - // Overriding BookmarkModelObserver @Override public void bookmarkModelChanged() { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java index ce2aa58..8a3b995 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkUtils.java @@ -210,8 +210,6 @@ public class EnhancedBookmarkUtils { final EnhancedBookmarksModel bookmarkModel, final Activity activity, final BookmarkId bookmarkId) { return new SnackbarController() { - @Override - public void onDismissForEachType(boolean isTimeout) {} @Override public void onDismissNoAction(Object actionData) { @@ -238,9 +236,6 @@ public class EnhancedBookmarkUtils { final Activity activity) { return new SnackbarController() { @Override - public void onDismissForEachType(boolean isTimeout) {} - - @Override public void onDismissNoAction(Object actionData) { // This method will be called only if the snackbar is dismissed by timeout. RecordUserAction.record( diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageFreeUpSpaceDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageFreeUpSpaceDialog.java index 5596e332..69234be 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageFreeUpSpaceDialog.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageFreeUpSpaceDialog.java @@ -56,8 +56,6 @@ public class OfflinePageFreeUpSpaceDialog R.string.offline_pages_storage_cleared)), new SnackbarController() { @Override - public void onDismissForEachType(boolean isTimeout) {} - @Override public void onDismissNoAction(Object actionData) {} @Override public void onAction(Object actionData) {} diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java index f713d22..a750c05 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageUtils.java @@ -293,9 +293,6 @@ public class OfflinePageUtils { break; } } - - @Override - public void onDismissForEachType(boolean isTimeout) {} }; Snackbar snackbar = Snackbar.make(context.getString(snackbarTextId), snackbarController) .setAction(context.getString(actionTextId), buttonType); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationSnackbarController.java index 3fe6818..fa0a08b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationSnackbarController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationSnackbarController.java @@ -126,9 +126,6 @@ public class GeolocationSnackbarController implements SnackbarController { public void onDismissNoAction(Object actionData) {} @Override - public void onDismissForEachType(boolean isTimeout) {} - - @Override public void onAction(Object actionData) { View view = (View) actionData; UiUtils.hideKeyboard(view); diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/DataUseSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/DataUseSnackbarController.java index 3da6729..479f873 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/DataUseSnackbarController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/DataUseSnackbarController.java @@ -90,7 +90,4 @@ public class DataUseSnackbarController implements SnackbarManager.SnackbarContro @Override public void onDismissNoAction(Object actionData) {} - - @Override - public void onDismissForEachType(boolean isTimeout) {} } 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 2bf2863..ab85ceb 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 @@ -125,7 +125,4 @@ public class LoFiBarPopupController implements SnackbarManager.SnackbarControlle @Override public void onDismissNoAction(Object actionData) {} - - @Override - public void onDismissForEachType(boolean isTimeout) {} }
\ No newline at end of file diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java index e2da38d..688d122 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/SnackbarManager.java @@ -20,7 +20,6 @@ import org.chromium.chrome.browser.device.DeviceClassManager; import org.chromium.ui.UiUtils; import org.chromium.ui.base.DeviceFormFactor; -import java.util.HashSet; import java.util.Stack; /** @@ -56,30 +55,16 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener */ public static interface SnackbarController { /** - * Callback triggered when user clicks on button at end of snackbar. This method is only - * called for controller having posted the entry the user clicked on; other controllers are - * not notified. Also once this {@link #onAction(Object)} is called, - * {@link #onDismissNoAction(Object)} and {@link #onDismissForEachType(boolean)} will not be - * called. + * Called when the user clicks the action button on the snackbar. * @param actionData Data object passed when showing this specific snackbar. */ void onAction(Object actionData); /** - * Callback triggered when the snackbar is dismissed by either timeout or UI environment - * change. This callback will be called for each entry a controller has posted, _except_ for - * entries which the user has done action with, by clicking the action button. + * Called when the snackbar is dismissed by tiemout or UI enviroment change. * @param actionData Data object associated with the dismissed snackbar entry. */ void onDismissNoAction(Object actionData); - - /** - * Notify each SnackbarControllers instance only once immediately before the snackbar is - * dismissed. This function is likely to be used for controllers to do user metrics for - * dismissal. - * @param isTimeout Whether this dismissal is triggered by timeout. - */ - void onDismissForEachType(boolean isTimeout); } private static final int DEFAULT_SNACKBAR_DURATION_MS = 3000; @@ -186,14 +171,8 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener mPopup = null; } - HashSet<SnackbarController> controllers = new HashSet<SnackbarController>(); - while (!mStack.isEmpty()) { Snackbar snackbar = mStack.pop(); - if (!controllers.contains(snackbar.getController())) { - snackbar.getController().onDismissForEachType(isTimeout); - controllers.add(snackbar.getController()); - } snackbar.getController().onDismissNoAction(snackbar.getActionData()); if (isTimeout && !mStack.isEmpty() && mStack.peek().getForceDisplay()) { @@ -221,7 +200,7 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener } if (!isFound) return; - finishSnackbarRemoval(controller); + finishSnackbarRemoval(); } /** @@ -242,12 +221,10 @@ public class SnackbarManager implements OnClickListener, OnGlobalLayoutListener } if (!isFound) return; - finishSnackbarRemoval(controller); + finishSnackbarRemoval(); } - private void finishSnackbarRemoval(SnackbarController controller) { - controller.onDismissForEachType(false); - + private void finishSnackbarRemoval() { if (mStack.isEmpty()) { dismissAllSnackbars(false); } else { diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java index 6ff38eb..87a80b2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/smartlockautosignin/AutoSigninSnackbarController.java @@ -87,10 +87,7 @@ public class AutoSigninSnackbarController public void onAction(Object actionData) {} @Override - public void onDismissNoAction(Object actionData) {} - - @Override - public void onDismissForEachType(boolean isTimeout) { + public void onDismissNoAction(Object actionData) { mTab.removeObserver(mTabObserver); } } diff --git a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java index a50683d..2ab3a8b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/snackbar/undo/UndoBarPopupController.java @@ -41,8 +41,6 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle private static final int TAB_CLOSE_UNDO_TOAST_SHOWN_COLD = 0; private static final int TAB_CLOSE_UNDO_TOAST_SHOWN_WARM = 1; private static final int TAB_CLOSE_UNDO_TOAST_PRESSED = 2; - private static final int TAB_CLOSE_UNDO_TOAST_DISMISSED_TIMEOUT = 3; - private static final int TAB_CLOSE_UNDO_TOAST_DISMISSED_ACTION = 4; private static final int TAB_CLOSE_UNDO_TOAST_COUNT = 5; private final TabModelSelector mTabModelSelector; @@ -193,12 +191,4 @@ public class UndoBarPopupController implements SnackbarManager.SnackbarControlle TabModel model = mTabModelSelector.getModelForTabId(tabId); if (model != null) model.commitTabClosure(tabId); } - - @Override - public void onDismissForEachType(boolean isTimeout) { - RecordHistogram.recordEnumeratedHistogram("AndroidTabCloseUndo.Toast", - isTimeout ? TAB_CLOSE_UNDO_TOAST_DISMISSED_TIMEOUT - : TAB_CLOSE_UNDO_TOAST_DISMISSED_ACTION, - TAB_CLOSE_UNDO_TOAST_COUNT); - } } diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index b6195d0..7db2113 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml @@ -56439,8 +56439,8 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries. <int value="0" label="Undo Shown (Cold)"/> <int value="1" label="Undo Shown (Warm)"/> <int value="2" label="Undo Pressed"/> - <int value="3" label="Undos Dismissed (Timeout)"/> - <int value="4" label="Undos Dismissed (Action)"/> + <int value="3" label="Undos Dismissed (Timeout) (Deprecated)"/> + <int value="4" label="Undos Dismissed (Action) (Deprecated)"/> </enum> <enum name="AppBannersDismissEvent" type="int"> |