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

Unified Diff: ash/launcher/launcher_tooltip_manager_unittest.cc

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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 1ae67ab8f1b1d83c3652105d2872cc6753d19450..71b80dabe2d1e2ab668f75cd1a07bfe8c951e617 100644
--- a/ash/launcher/launcher_tooltip_manager_unittest.cc
+++ b/ash/launcher/launcher_tooltip_manager_unittest.cc
@@ -153,14 +153,14 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) {
// Should hide for touch events.
ui::TouchEvent touch_event(
ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta());
- EXPECT_EQ(ui::TOUCH_STATUS_UNKNOWN,
+ EXPECT_EQ(ui::ER_UNHANDLED,
event_filter->PreHandleTouchEvent(root_window, &touch_event));
EXPECT_FALSE(TooltipIsVisible());
// Shouldn't hide if the touch happens on the tooltip.
ShowImmediately();
views::Widget* tooltip_widget = GetTooltipWidget();
- EXPECT_EQ(ui::TOUCH_STATUS_UNKNOWN,
+ EXPECT_EQ(ui::ER_UNHANDLED,
event_filter->PreHandleTouchEvent(
tooltip_widget->GetNativeWindow(), &touch_event));
EXPECT_TRUE(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