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

Side by Side Diff: ash/wm/user_activity_detector.cc

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing Created 8 years 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/user_activity_detector.h ('k') | ash/wm/user_activity_detector_unittest.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 #include "ash/wm/user_activity_detector.h" 5 #include "ash/wm/user_activity_detector.h"
6 6
7 #include "ash/wm/property_util.h" 7 #include "ash/wm/property_util.h"
8 #include "ash/wm/user_activity_observer.h" 8 #include "ash/wm/user_activity_observer.h"
9 #include "ui/base/events/event.h" 9 #include "ui/base/events/event.h"
10 10
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 void UserActivityDetector::RemoveObserver(UserActivityObserver* observer) { 29 void UserActivityDetector::RemoveObserver(UserActivityObserver* observer) {
30 observers_.RemoveObserver(observer); 30 observers_.RemoveObserver(observer);
31 } 31 }
32 32
33 void UserActivityDetector::OnAllOutputsTurnedOff() { 33 void UserActivityDetector::OnAllOutputsTurnedOff() {
34 ignore_next_mouse_event_ = true; 34 ignore_next_mouse_event_ = true;
35 } 35 }
36 36
37 ui::EventResult UserActivityDetector::OnKeyEvent(ui::KeyEvent* event) { 37 void UserActivityDetector::OnKeyEvent(ui::KeyEvent* event) {
38 MaybeNotify(); 38 MaybeNotify();
39 return ui::ER_UNHANDLED;
40 } 39 }
41 40
42 ui::EventResult UserActivityDetector::OnMouseEvent(ui::MouseEvent* event) { 41 ui::EventResult UserActivityDetector::OnMouseEvent(ui::MouseEvent* event) {
43 VLOG_IF(1, ignore_next_mouse_event_) << "ignoring mouse event"; 42 VLOG_IF(1, ignore_next_mouse_event_) << "ignoring mouse event";
44 if (!(event->flags() & ui::EF_IS_SYNTHESIZED) && 43 if (!(event->flags() & ui::EF_IS_SYNTHESIZED) &&
45 !ignore_next_mouse_event_) 44 !ignore_next_mouse_event_)
46 MaybeNotify(); 45 MaybeNotify();
47 ignore_next_mouse_event_ = false; 46 ignore_next_mouse_event_ = false;
48 return ui::ER_UNHANDLED; 47 return ui::ER_UNHANDLED;
49 } 48 }
(...skipping 15 matching lines...) Expand all
65 !now_for_test_.is_null() ? now_for_test_ : base::TimeTicks::Now(); 64 !now_for_test_.is_null() ? now_for_test_ : base::TimeTicks::Now();
66 if (last_observer_notification_time_.is_null() || 65 if (last_observer_notification_time_.is_null() ||
67 (now - last_observer_notification_time_).InMillisecondsF() >= 66 (now - last_observer_notification_time_).InMillisecondsF() >=
68 kNotifyIntervalMs) { 67 kNotifyIntervalMs) {
69 FOR_EACH_OBSERVER(UserActivityObserver, observers_, OnUserActivity()); 68 FOR_EACH_OBSERVER(UserActivityObserver, observers_, OnUserActivity());
70 last_observer_notification_time_ = now; 69 last_observer_notification_time_ = now;
71 } 70 }
72 } 71 }
73 72
74 } // namespace ash 73 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/user_activity_detector.h ('k') | ash/wm/user_activity_detector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698