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

Unified Diff: ui/app_list/views/app_list_main_view_unittest.cc

Issue 840373003: MacViews: Fix app_list_unittests for mouseover change in r311143 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20141229-MacViews-bringup2-plus-glevin
Patch Set: Created 5 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_main_view_unittest.cc
diff --git a/ui/app_list/views/app_list_main_view_unittest.cc b/ui/app_list/views/app_list_main_view_unittest.cc
index bd21330ead59908db9cc4af9862d6ed44142b7c1..292568e2d7c68cddbda73789f1786b8852db7736 100644
--- a/ui/app_list/views/app_list_main_view_unittest.cc
+++ b/ui/app_list/views/app_list_main_view_unittest.cc
@@ -273,8 +273,8 @@ TEST_F(AppListMainViewTest, MouseHoverToHighlight) {
delegate_->GetTestModel()->PopulateApps(2);
main_widget_->Show();
- ui::test::EventGenerator generator(
- main_widget_->GetNativeWindow()->GetRootWindow());
+ ui::test::EventGenerator generator(GetContext(),
+ main_widget_->GetNativeWindow());
AppListItemView* item0 = RootViewModel()->view_at(0);
AppListItemView* item1 = RootViewModel()->view_at(1);
@@ -298,13 +298,20 @@ TEST_F(AppListMainViewTest, MouseHoverToHighlight) {
EXPECT_FALSE(item1->is_highlighted());
}
+// No touch on desktop Mac. Tracked in http://crbug.com/445520.
+#if defined(OS_MACOSX) && !defined(USE_AURA)
+#define MAYBE_TapGestureToHighlight DISABLED_TapGestureToHighlight
+#else
+#define MAYBE_TapGestureToHighlight TapGestureToHighlight
+#endif
+
// Tests that tap gesture on app item highlights it
-TEST_F(AppListMainViewTest, TapGestureToHighlight) {
+TEST_F(AppListMainViewTest, MAYBE_TapGestureToHighlight) {
delegate_->GetTestModel()->PopulateApps(1);
main_widget_->Show();
- ui::test::EventGenerator generator(
- main_widget_->GetNativeWindow()->GetRootWindow());
+ ui::test::EventGenerator generator(GetContext(),
+ main_widget_->GetNativeWindow());
AppListItemView* item = RootViewModel()->view_at(0);
// If experimental launcher, switch to All Apps page
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698