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

Unified Diff: ash/wm/overlay_event_filter.cc

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « ash/wm/overlay_event_filter.h ('k') | ash/wm/panel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overlay_event_filter.cc
===================================================================
--- ash/wm/overlay_event_filter.cc (revision 150582)
+++ ash/wm/overlay_event_filter.cc (working copy)
@@ -7,6 +7,7 @@
#include "ash/wm/partial_screenshot_view.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
+#include "ui/base/event.h"
#include "ui/views/widget/widget.h"
namespace ash {
@@ -21,7 +22,7 @@
}
bool OverlayEventFilter::PreHandleKeyEvent(
- aura::Window* target, aura::KeyEvent* event) {
+ aura::Window* target, ui::KeyEvent* event) {
if (!delegate_)
return false;
@@ -48,7 +49,7 @@
}
bool OverlayEventFilter::PreHandleMouseEvent(
- aura::Window* target, aura::MouseEvent* event) {
+ aura::Window* target, ui::MouseEvent* event) {
if (delegate_) {
DCHECK_EQ(target, delegate_->GetWindow());
target->delegate()->OnMouseEvent(event);
@@ -58,12 +59,12 @@
}
ui::TouchStatus OverlayEventFilter::PreHandleTouchEvent(
- aura::Window* target, aura::TouchEvent* event) {
+ aura::Window* target, ui::TouchEventImpl* event) {
return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
}
ui::GestureStatus OverlayEventFilter::PreHandleGestureEvent(
- aura::Window* target, aura::GestureEvent* event) {
+ aura::Window* target, ui::GestureEventImpl* event) {
return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
}
« no previous file with comments | « ash/wm/overlay_event_filter.h ('k') | ash/wm/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698