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

Unified Diff: ash/test/shelf_view_test_api.cc

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed TODO Created 4 years, 6 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
« no previous file with comments | « ash/test/shelf_view_test_api.h ('k') | chrome/browser/ui/views/bar_control_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/shelf_view_test_api.cc
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
index d6dd01267840da8d6c783e7b5bc02f5f20647433..495ac1d14f62a9089bb2ff3f28e3f4acc1809db0 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -11,6 +11,7 @@
#include "ash/shelf/shelf_view.h"
#include "base/message_loop/message_loop.h"
#include "ui/views/animation/bounds_animator.h"
+#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/view_model.h"
namespace {
@@ -98,6 +99,13 @@ void ShelfViewTestAPI::RunMessageLoopUntilAnimationsDone() {
shelf_view_->bounds_animator_->RemoveObserver(observer.get());
}
+void ShelfViewTestAPI::CloseMenu() {
+ if (!shelf_view_->launcher_menu_runner_)
+ return;
+
+ shelf_view_->launcher_menu_runner_->Cancel();
+}
+
OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
return shelf_view_->overflow_bubble_.get();
}
@@ -118,9 +126,14 @@ int ShelfViewTestAPI::GetButtonSpacing() {
return GetShelfConstant(SHELF_BUTTON_SPACING);
}
+int ShelfViewTestAPI::GetMinimumDragDistance() const {
+ return ShelfView::kMinimumDragDistance;
+}
+
void ShelfViewTestAPI::ButtonPressed(views::Button* sender,
- const ui::Event& event) {
- return shelf_view_->ButtonPressed(sender, event);
+ const ui::Event& event,
+ views::InkDrop* ink_drop) {
+ return shelf_view_->ButtonPressed(sender, event, ink_drop);
}
bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,
« no previous file with comments | « ash/test/shelf_view_test_api.h ('k') | chrome/browser/ui/views/bar_control_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698