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

Side by Side Diff: ash/wm/system_modal_container_event_filter.h

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_gesture_event_filter.cc ('k') | ash/wm/system_modal_container_event_filter.cc » ('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 #ifndef ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_ 5 #ifndef ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_
6 #define ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_ 6 #define ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "ui/aura/event_filter.h" 9 #include "ui/aura/event_filter.h"
10 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
11 11
12 namespace ash { 12 namespace ash {
13 namespace internal { 13 namespace internal {
14 14
15 class SystemModalContainerEventFilterDelegate; 15 class SystemModalContainerEventFilterDelegate;
16 16
17 class ASH_EXPORT SystemModalContainerEventFilter : public aura::EventFilter { 17 class ASH_EXPORT SystemModalContainerEventFilter : public aura::EventFilter {
18 public: 18 public:
19 explicit SystemModalContainerEventFilter( 19 explicit SystemModalContainerEventFilter(
20 SystemModalContainerEventFilterDelegate* delegate); 20 SystemModalContainerEventFilterDelegate* delegate);
21 virtual ~SystemModalContainerEventFilter(); 21 virtual ~SystemModalContainerEventFilter();
22 22
23 // Overridden from aura::EventFilter: 23 // Overridden from aura::EventFilter:
24 virtual bool PreHandleKeyEvent(aura::Window* target, 24 virtual bool PreHandleKeyEvent(aura::Window* target,
25 ui::KeyEvent* event) OVERRIDE; 25 ui::KeyEvent* event) OVERRIDE;
26 virtual bool PreHandleMouseEvent(aura::Window* target, 26 virtual bool PreHandleMouseEvent(aura::Window* target,
27 ui::MouseEvent* event) OVERRIDE; 27 ui::MouseEvent* event) OVERRIDE;
28 virtual ui::TouchStatus PreHandleTouchEvent( 28 virtual ui::EventResult PreHandleTouchEvent(
29 aura::Window* target, 29 aura::Window* target,
30 ui::TouchEvent* event) OVERRIDE; 30 ui::TouchEvent* event) OVERRIDE;
31 virtual ui::EventResult PreHandleGestureEvent( 31 virtual ui::EventResult PreHandleGestureEvent(
32 aura::Window* target, 32 aura::Window* target,
33 ui::GestureEvent* event) OVERRIDE; 33 ui::GestureEvent* event) OVERRIDE;
34 34
35 private: 35 private:
36 SystemModalContainerEventFilterDelegate* delegate_; 36 SystemModalContainerEventFilterDelegate* delegate_;
37 37
38 DISALLOW_COPY_AND_ASSIGN(SystemModalContainerEventFilter); 38 DISALLOW_COPY_AND_ASSIGN(SystemModalContainerEventFilter);
39 }; 39 };
40 40
41 } // namespace internal 41 } // namespace internal
42 } // namespace ash 42 } // namespace ash
43 43
44 #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_ 44 #endif // ASH_WM_SYSTEM_MODAL_CONTAINER_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ash/wm/system_gesture_event_filter.cc ('k') | ash/wm/system_modal_container_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698