ash/wm/user_activity_detector.cc - Issue 11570012: events: Update key-event handlers to not return EventResult.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: ash/wm/user_activity_detector.cc

diff --git a/ash/wm/user_activity_detector.cc b/ash/wm/user_activity_detector.cc

index 4338accbe294a124bca9a197b6d59ca7273180c9..6c55f896c4b3e5914a5459ab9d60311b07bc4c39 100644

--- a/ash/wm/user_activity_detector.cc

+++ b/ash/wm/user_activity_detector.cc

@@ -34,9 +34,8 @@ void UserActivityDetector::OnAllOutputsTurnedOff() {

ignore_next_mouse_event_ = true;

}

-ui::EventResult UserActivityDetector::OnKeyEvent(ui::KeyEvent* event) {

+void UserActivityDetector::OnKeyEvent(ui::KeyEvent* event) {

MaybeNotify();

- return ui::ER_UNHANDLED;

}

ui::EventResult UserActivityDetector::OnMouseEvent(ui::MouseEvent* event) {

« 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 »