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

Side by Side Diff: ash/wm/system_gesture_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/shelf_layout_manager.cc ('k') | ash/wm/system_gesture_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_GESTURE_EVENT_FILTER_H_ 5 #ifndef ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
6 #define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ 6 #define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/touch/touch_uma.h" 9 #include "ash/touch/touch_uma.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 public aura::WindowObserver { 42 public aura::WindowObserver {
43 public: 43 public:
44 SystemGestureEventFilter(); 44 SystemGestureEventFilter();
45 virtual ~SystemGestureEventFilter(); 45 virtual ~SystemGestureEventFilter();
46 46
47 // Overridden from aura::EventFilter: 47 // Overridden from aura::EventFilter:
48 virtual bool PreHandleKeyEvent(aura::Window* target, 48 virtual bool PreHandleKeyEvent(aura::Window* target,
49 ui::KeyEvent* event) OVERRIDE; 49 ui::KeyEvent* event) OVERRIDE;
50 virtual bool PreHandleMouseEvent(aura::Window* target, 50 virtual bool PreHandleMouseEvent(aura::Window* target,
51 ui::MouseEvent* event) OVERRIDE; 51 ui::MouseEvent* event) OVERRIDE;
52 virtual ui::TouchStatus PreHandleTouchEvent( 52 virtual ui::EventResult PreHandleTouchEvent(
53 aura::Window* target, 53 aura::Window* target,
54 ui::TouchEvent* event) OVERRIDE; 54 ui::TouchEvent* event) OVERRIDE;
55 virtual ui::EventResult PreHandleGestureEvent( 55 virtual ui::EventResult PreHandleGestureEvent(
56 aura::Window* target, 56 aura::Window* target,
57 ui::GestureEvent* event) OVERRIDE; 57 ui::GestureEvent* event) OVERRIDE;
58 58
59 // Overridden from aura::WindowObserver. 59 // Overridden from aura::WindowObserver.
60 virtual void OnWindowVisibilityChanged(aura::Window* window, 60 virtual void OnWindowVisibilityChanged(aura::Window* window,
61 bool visible) OVERRIDE; 61 bool visible) OVERRIDE;
62 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 62 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
(...skipping 17 matching lines...) Expand all
80 80
81 TouchUMA touch_uma_; 81 TouchUMA touch_uma_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter); 83 DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter);
84 }; 84 };
85 85
86 } // namespace internal 86 } // namespace internal
87 } // namespace ash 87 } // namespace ash
88 88
89 #endif // ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ 89 #endif // ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698