diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 22:28:04 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 22:28:04 +0000 |
| commit | 8ca8d24697eb99d14cab7028ad3b7c152dde7d56 (patch) | |
| tree | 52ed61ac468fe094769ef78b3813af0fd51ab5bd /ash/launcher | |
| parent | 2a848e0e4d75cd9195d15ff955014397482f9faa (diff) | |
| download | chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.zip chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.tar.gz chromium_src-8ca8d24697eb99d14cab7028ad3b7c152dde7d56.tar.bz2 | |
Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent.
BUG=125937
Review URL: https://chromiumcodereview.appspot.com/10831240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.cc | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager.h | 2 | ||||
| -rw-r--r-- | ash/launcher/launcher_tooltip_manager_unittest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc index 51b56d0..04f7fbc 100644 --- a/ash/launcher/launcher_tooltip_manager.cc +++ b/ash/launcher/launcher_tooltip_manager.cc @@ -332,7 +332,7 @@ bool LauncherTooltipManager::PreHandleMouseEvent(aura::Window* target, } ui::TouchStatus LauncherTooltipManager::PreHandleTouchEvent( - aura::Window* target, ui::TouchEventImpl* event) { + aura::Window* target, ui::TouchEvent* event) { if (widget_ && widget_->IsVisible() && widget_->GetNativeWindow() != target) Close(); return ui::TOUCH_STATUS_UNKNOWN; diff --git a/ash/launcher/launcher_tooltip_manager.h b/ash/launcher/launcher_tooltip_manager.h index 95c9fcf..ed13731 100644 --- a/ash/launcher/launcher_tooltip_manager.h +++ b/ash/launcher/launcher_tooltip_manager.h @@ -77,7 +77,7 @@ protected: ui::MouseEvent* event) OVERRIDE; virtual ui::TouchStatus PreHandleTouchEvent( aura::Window* target, - ui::TouchEventImpl* event) OVERRIDE; + ui::TouchEvent* event) OVERRIDE; virtual ui::GestureStatus PreHandleGestureEvent( aura::Window* target, ui::GestureEventImpl* event) OVERRIDE; diff --git a/ash/launcher/launcher_tooltip_manager_unittest.cc b/ash/launcher/launcher_tooltip_manager_unittest.cc index 391d948..527b4cd 100644 --- a/ash/launcher/launcher_tooltip_manager_unittest.cc +++ b/ash/launcher/launcher_tooltip_manager_unittest.cc @@ -146,7 +146,7 @@ TEST_F(LauncherTooltipManagerTest, ShouldHideForEvents) { EXPECT_TRUE(TooltipIsVisible()); // Should hide for touch events. - ui::TouchEventImpl touch_event( + ui::TouchEvent touch_event( ui::ET_TOUCH_PRESSED, gfx::Point(), 0, base::TimeDelta()); EXPECT_EQ(ui::TOUCH_STATUS_UNKNOWN, event_filter->PreHandleTouchEvent(root_window, &touch_event)); |