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

Side by Side Diff: ash/wm/system_modal_container_event_filter.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/system_modal_container_event_filter.h ('k') | ash/wm/user_activity_detector.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/system_modal_container_event_filter.h" 5 #include "ash/wm/system_modal_container_event_filter.h"
6 6
7 #include "ash/wm/system_modal_container_event_filter_delegate.h" 7 #include "ash/wm/system_modal_container_event_filter_delegate.h"
8 #include "ui/base/events/event.h" 8 #include "ui/base/events/event.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 12 matching lines...) Expand all
23 ui::KeyEvent* event) { 23 ui::KeyEvent* event) {
24 return !delegate_->CanWindowReceiveEvents(target); 24 return !delegate_->CanWindowReceiveEvents(target);
25 } 25 }
26 26
27 bool SystemModalContainerEventFilter::PreHandleMouseEvent( 27 bool SystemModalContainerEventFilter::PreHandleMouseEvent(
28 aura::Window* target, 28 aura::Window* target,
29 ui::MouseEvent* event) { 29 ui::MouseEvent* event) {
30 return !delegate_->CanWindowReceiveEvents(target); 30 return !delegate_->CanWindowReceiveEvents(target);
31 } 31 }
32 32
33 ui::TouchStatus SystemModalContainerEventFilter::PreHandleTouchEvent( 33 ui::EventResult SystemModalContainerEventFilter::PreHandleTouchEvent(
34 aura::Window* target, 34 aura::Window* target,
35 ui::TouchEvent* event) { 35 ui::TouchEvent* event) {
36 // TODO(sadrul): ! 36 // TODO(sadrul): !
37 return ui::TOUCH_STATUS_UNKNOWN; 37 return ui::ER_UNHANDLED;
38 } 38 }
39 39
40 ui::EventResult SystemModalContainerEventFilter::PreHandleGestureEvent( 40 ui::EventResult SystemModalContainerEventFilter::PreHandleGestureEvent(
41 aura::Window* target, 41 aura::Window* target,
42 ui::GestureEvent* event) { 42 ui::GestureEvent* event) {
43 // TODO(sad): 43 // TODO(sad):
44 return ui::ER_UNHANDLED; 44 return ui::ER_UNHANDLED;
45 } 45 }
46 46
47 } // namespace internal 47 } // namespace internal
48 } // namespace ash 48 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_event_filter.h ('k') | ash/wm/user_activity_detector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698