summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authorjamescook <jamescook@chromium.org>2014-08-25 09:36:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-25 16:37:49 +0000
commit4963830383cd11d5ad000504a3f9dcc49ec122d4 (patch)
tree409b33a1c988ce51ef9216757043e80435e71e73 /ash/test
parent5bfbee1117e27d85ec463ef31998fac500aac35d (diff)
downloadchromium_src-4963830383cd11d5ad000504a3f9dcc49ec122d4.zip
chromium_src-4963830383cd11d5ad000504a3f9dcc49ec122d4.tar.gz
chromium_src-4963830383cd11d5ad000504a3f9dcc49ec122d4.tar.bz2
Ash: Double-clicking on a shelf item now opens the item
Previously it would open the item then immediately minimize it. This caused user confusion because they tried a double-click and didn't see anything open on the screen. BUG=404060 TEST=ash_unittests ShelfViewTest.ClickingTwiceActivatesOnce Review URL: https://codereview.chromium.org/492963008 Cr-Commit-Position: refs/heads/master@{#291695}
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/shelf_view_test_api.cc5
-rw-r--r--ash/test/shelf_view_test_api.h11
2 files changed, 16 insertions, 0 deletions
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
index d190f95..b55690f 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -114,6 +114,11 @@ int ShelfViewTestAPI::GetButtonSpacing() {
return kShelfButtonSpacing;
}
+void ShelfViewTestAPI::ButtonPressed(views::Button* sender,
+ const ui::Event& event) {
+ return shelf_view_->ButtonPressed(sender, event);
+}
+
bool ShelfViewTestAPI::SameDragType(ShelfItemType typea,
ShelfItemType typeb) const {
return shelf_view_->SameDragType(typea, typeb);
diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h
index 71853fd..7916ea7 100644
--- a/ash/test/shelf_view_test_api.h
+++ b/ash/test/shelf_view_test_api.h
@@ -13,6 +13,14 @@ class Rect;
class Size;
}
+namespace ui {
+class Event;
+}
+
+namespace views {
+class Button;
+}
+
namespace ash {
class OverflowBubble;
class ShelfButton;
@@ -70,6 +78,9 @@ class ShelfViewTestAPI {
// Returns the button space size.
int GetButtonSpacing();
+ // Wrapper for ShelfView::ButtonPressed.
+ void ButtonPressed(views::Button* sender, const ui::Event& event);
+
// Wrapper for ShelfView::SameDragType.
bool SameDragType(ShelfItemType typea, ShelfItemType typeb) const;