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

Unified Diff: ash/launcher/launcher_tooltip_manager_unittest.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/magnifier/magnification_controller.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 0fcbe28a9e5a590e2cf3151aead5d2cfe2af2ece..249b0a084c3627e0eceef085573f1c7ff19caf08 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -204,14 +204,14 @@ TEST_F(LauncherTooltipManagerTest, HideForMouseEvent) {
ui::LocatedEvent::TestApi test_api(&mouse_event);
SetEventTarget(root_window, &mouse_event);
- EXPECT_EQ(ui::ER_UNHANDLED,
- event_handler->OnMouseEvent(&mouse_event));
+ event_handler->OnMouseEvent(&mouse_event);
+ EXPECT_FALSE(mouse_event.handled());
EXPECT_TRUE(TooltipIsVisible());
// Should hide if the mouse is out of the tooltip.
test_api.set_location(tooltip_rect.origin() + gfx::Vector2d(-1, -1));
- EXPECT_EQ(ui::ER_UNHANDLED,
- event_handler->OnMouseEvent(&mouse_event));
+ event_handler->OnMouseEvent(&mouse_event);
+ EXPECT_FALSE(mouse_event.handled());
RunAllPendingInMessageLoop();
EXPECT_FALSE(TooltipIsVisible());
}
« no previous file with comments | « ash/launcher/launcher_tooltip_manager.cc ('k') | ash/magnifier/magnification_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698