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

Unified Diff: ash/launcher/launcher_tooltip_manager_unittest.cc

Issue 11568006: events: Update scroll and touch handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: self-nit Created 8 years 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/launcher/launcher_tooltip_manager.cc ('k') | ash/launcher/overflow_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_tooltip_manager_unittest.cc
diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc
index c6d81ddf556fb08610bb30c22e826b58b987b718..e1464da603fe6dd3595aa72a044205165442082a 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -164,16 +164,16 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) {
ui::TouchEvent touch_event(
ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta());
SetEventTarget(root_window, &touch_event);
- EXPECT_EQ(ui::ER_UNHANDLED,
- event_handler->OnTouchEvent(&touch_event));
+ event_handler->OnTouchEvent(&touch_event);
+ EXPECT_FALSE(touch_event.handled());
EXPECT_FALSE(TooltipIsVisible());
// Shouldn't hide if the touch happens on the tooltip.
ShowImmediately();
views::Widget* tooltip_widget = GetTooltipWidget();
SetEventTarget(tooltip_widget->GetNativeWindow(), &touch_event);
- EXPECT_EQ(ui::ER_UNHANDLED,
- event_handler->OnTouchEvent(&touch_event));
+ event_handler->OnTouchEvent(&touch_event);
+ EXPECT_FALSE(touch_event.handled());
EXPECT_TRUE(TooltipIsVisible());
// Should hide for gesture events.
« no previous file with comments | « ash/launcher/launcher_tooltip_manager.cc ('k') | ash/launcher/overflow_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698