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

Side by Side Diff: ash/system/tray/tray_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/magnifier/magnification_controller.cc ('k') | ash/system/tray/tray_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_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_
6 #define ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "ui/aura/event_filter.h" 9 #include "ui/aura/event_filter.h"
10 #include "ui/base/events/event.h" 10 #include "ui/base/events/event.h"
(...skipping 12 matching lines...) Expand all
23 class TrayEventFilter : public aura::EventFilter { 23 class TrayEventFilter : public aura::EventFilter {
24 public: 24 public:
25 explicit TrayEventFilter(TrayBubbleWrapper* wrapper); 25 explicit TrayEventFilter(TrayBubbleWrapper* wrapper);
26 virtual ~TrayEventFilter(); 26 virtual ~TrayEventFilter();
27 27
28 // Overridden from aura::EventFilter. 28 // Overridden from aura::EventFilter.
29 virtual bool PreHandleKeyEvent(aura::Window* target, 29 virtual bool PreHandleKeyEvent(aura::Window* target,
30 ui::KeyEvent* event) OVERRIDE; 30 ui::KeyEvent* event) OVERRIDE;
31 virtual bool PreHandleMouseEvent(aura::Window* target, 31 virtual bool PreHandleMouseEvent(aura::Window* target,
32 ui::MouseEvent* event) OVERRIDE; 32 ui::MouseEvent* event) OVERRIDE;
33 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 33 virtual ui::EventResult PreHandleTouchEvent(aura::Window* target,
34 ui::TouchEvent* event) OVERRIDE; 34 ui::TouchEvent* event) OVERRIDE;
35 virtual ui::EventResult PreHandleGestureEvent( 35 virtual ui::EventResult PreHandleGestureEvent(
36 aura::Window* target, 36 aura::Window* target,
37 ui::GestureEvent* event) OVERRIDE; 37 ui::GestureEvent* event) OVERRIDE;
38 38
39 private: 39 private:
40 // Returns true if the event is handled. 40 // Returns true if the event is handled.
41 bool ProcessLocatedEvent(aura::Window* target, 41 bool ProcessLocatedEvent(aura::Window* target,
42 const ui::LocatedEvent& event); 42 const ui::LocatedEvent& event);
43 43
44 TrayBubbleWrapper* wrapper_; 44 TrayBubbleWrapper* wrapper_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(TrayEventFilter); 46 DISALLOW_COPY_AND_ASSIGN(TrayEventFilter);
47 }; 47 };
48 48
49 } // namespace internal 49 } // namespace internal
50 } // namespace ash 50 } // namespace ash
51 51
52 #endif // ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_ 52 #endif // ASH_SYSTEM_TRAY_TRAY_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/system/tray/tray_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698