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

Side by Side Diff: ash/wm/user_activity_detector.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_modal_container_event_filter.cc ('k') | ash/wm/user_activity_detector.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_USER_ACTIVITY_DETECTOR_H_ 5 #ifndef ASH_WM_USER_ACTIVITY_DETECTOR_H_
6 #define ASH_WM_USER_ACTIVITY_DETECTOR_H_ 6 #define ASH_WM_USER_ACTIVITY_DETECTOR_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 23 matching lines...) Expand all
34 // Called when chrome has received a request to turn of all displays. 34 // Called when chrome has received a request to turn of all displays.
35 void OnAllOutputsTurnedOff(); 35 void OnAllOutputsTurnedOff();
36 36
37 // aura::EventFilter implementation. 37 // aura::EventFilter implementation.
38 virtual bool PreHandleKeyEvent( 38 virtual bool PreHandleKeyEvent(
39 aura::Window* target, 39 aura::Window* target,
40 ui::KeyEvent* event) OVERRIDE; 40 ui::KeyEvent* event) OVERRIDE;
41 virtual bool PreHandleMouseEvent( 41 virtual bool PreHandleMouseEvent(
42 aura::Window* target, 42 aura::Window* target,
43 ui::MouseEvent* event) OVERRIDE; 43 ui::MouseEvent* event) OVERRIDE;
44 virtual ui::TouchStatus PreHandleTouchEvent( 44 virtual ui::EventResult PreHandleTouchEvent(
45 aura::Window* target, 45 aura::Window* target,
46 ui::TouchEvent* event) OVERRIDE; 46 ui::TouchEvent* event) OVERRIDE;
47 virtual ui::EventResult PreHandleGestureEvent( 47 virtual ui::EventResult PreHandleGestureEvent(
48 aura::Window* target, 48 aura::Window* target,
49 ui::GestureEvent* event) OVERRIDE; 49 ui::GestureEvent* event) OVERRIDE;
50 50
51 private: 51 private:
52 // Notifies observers if enough time has passed since the last notification. 52 // Notifies observers if enough time has passed since the last notification.
53 void MaybeNotify(); 53 void MaybeNotify();
54 54
(...skipping 10 matching lines...) Expand all
65 // avoid mis-detecting a mouse enter event that occurs when turning 65 // avoid mis-detecting a mouse enter event that occurs when turning
66 // off display as a user activity. 66 // off display as a user activity.
67 bool ignore_next_mouse_event_; 67 bool ignore_next_mouse_event_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(UserActivityDetector); 69 DISALLOW_COPY_AND_ASSIGN(UserActivityDetector);
70 }; 70 };
71 71
72 } // namespace ash 72 } // namespace ash
73 73
74 #endif // ASH_WM_USER_ACTIVITY_DETECTOR_H_ 74 #endif // ASH_WM_USER_ACTIVITY_DETECTOR_H_
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_event_filter.cc ('k') | ash/wm/user_activity_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698