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

Side by Side Diff: ui/base/events/event_target.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 | « ui/base/events/event_target.h ('k') | ui/views/corewm/compound_event_filter.h » ('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 "ui/base/events/event_target.h" 5 #include "ui/base/events/event_target.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/events/event.h" 10 #include "ui/base/events/event.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 } 45 }
46 46
47 void EventTarget::OnEvent(Event* event) { 47 void EventTarget::OnEvent(Event* event) {
48 CHECK_EQ(this, event->target()); 48 CHECK_EQ(this, event->target());
49 if (target_handler_) 49 if (target_handler_)
50 target_handler_->OnEvent(event); 50 target_handler_->OnEvent(event);
51 else 51 else
52 EventHandler::OnEvent(event); 52 EventHandler::OnEvent(event);
53 } 53 }
54 54
55 EventResult EventTarget::OnKeyEvent(KeyEvent* event) { 55 void EventTarget::OnKeyEvent(KeyEvent* event) {
56 CHECK_EQ(this, event->target()); 56 CHECK_EQ(this, event->target());
57 return target_handler_ ? target_handler_->OnKeyEvent(event) : ER_UNHANDLED; 57 if (target_handler_)
58 target_handler_->OnKeyEvent(event);
58 } 59 }
59 60
60 EventResult EventTarget::OnMouseEvent(MouseEvent* event) { 61 EventResult EventTarget::OnMouseEvent(MouseEvent* event) {
61 CHECK_EQ(this, event->target()); 62 CHECK_EQ(this, event->target());
62 return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED; 63 return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED;
63 } 64 }
64 65
65 void EventTarget::OnScrollEvent(ScrollEvent* event) { 66 void EventTarget::OnScrollEvent(ScrollEvent* event) {
66 CHECK_EQ(this, event->target()); 67 CHECK_EQ(this, event->target());
67 if (target_handler_) 68 if (target_handler_)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 while (target) { 100 while (target) {
100 for (EventHandlerList::iterator it = target->post_target_list_.begin(), 101 for (EventHandlerList::iterator it = target->post_target_list_.begin(),
101 end = target->post_target_list_.end(); it != end; ++it) { 102 end = target->post_target_list_.end(); it != end; ++it) {
102 list->push_back(*it); 103 list->push_back(*it);
103 } 104 }
104 target = target->GetParentTarget(); 105 target = target->GetParentTarget();
105 } 106 }
106 } 107 }
107 108
108 } // namespace ui 109 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/events/event_target.h ('k') | ui/views/corewm/compound_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698