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

Unified Diff: ash/wm/system_modal_container_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/system_modal_container_event_filter.h ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_modal_container_event_filter.cc
===================================================================
--- ash/wm/system_modal_container_event_filter.cc (revision 150582)
+++ ash/wm/system_modal_container_event_filter.cc (working copy)
@@ -5,7 +5,7 @@
#include "ash/wm/system_modal_container_event_filter.h"
#include "ash/wm/system_modal_container_event_filter_delegate.h"
-#include "ui/aura/event.h"
+#include "ui/base/event.h"
namespace ash {
namespace internal {
@@ -20,26 +20,26 @@
bool SystemModalContainerEventFilter::PreHandleKeyEvent(
aura::Window* target,
- aura::KeyEvent* event) {
+ ui::KeyEvent* event) {
return !delegate_->CanWindowReceiveEvents(target);
}
bool SystemModalContainerEventFilter::PreHandleMouseEvent(
aura::Window* target,
- aura::MouseEvent* event) {
+ ui::MouseEvent* event) {
return !delegate_->CanWindowReceiveEvents(target);
}
ui::TouchStatus SystemModalContainerEventFilter::PreHandleTouchEvent(
aura::Window* target,
- aura::TouchEvent* event) {
+ ui::TouchEventImpl* event) {
// TODO(sadrul): !
return ui::TOUCH_STATUS_UNKNOWN;
}
ui::GestureStatus SystemModalContainerEventFilter::PreHandleGestureEvent(
aura::Window* target,
- aura::GestureEvent* event) {
+ ui::GestureEventImpl* event) {
// TODO(sad):
return ui::GESTURE_STATUS_UNKNOWN;
}
« no previous file with comments | « ash/wm/system_modal_container_event_filter.h ('k') | ash/wm/system_modal_container_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698