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

Side by Side Diff: ui/base/events/event_target.cc

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 else 51 else
52 EventHandler::OnEvent(event); 52 EventHandler::OnEvent(event);
53 } 53 }
54 54
55 void EventTarget::OnKeyEvent(KeyEvent* event) { 55 void EventTarget::OnKeyEvent(KeyEvent* event) {
56 CHECK_EQ(this, event->target()); 56 CHECK_EQ(this, event->target());
57 if (target_handler_) 57 if (target_handler_)
58 target_handler_->OnKeyEvent(event); 58 target_handler_->OnKeyEvent(event);
59 } 59 }
60 60
61 EventResult EventTarget::OnMouseEvent(MouseEvent* event) { 61 void EventTarget::OnMouseEvent(MouseEvent* event) {
62 CHECK_EQ(this, event->target()); 62 CHECK_EQ(this, event->target());
63 return target_handler_ ? target_handler_->OnMouseEvent(event) : ER_UNHANDLED; 63 if (target_handler_)
64 target_handler_->OnMouseEvent(event);
64 } 65 }
65 66
66 void EventTarget::OnScrollEvent(ScrollEvent* event) { 67 void EventTarget::OnScrollEvent(ScrollEvent* event) {
67 CHECK_EQ(this, event->target()); 68 CHECK_EQ(this, event->target());
68 if (target_handler_) 69 if (target_handler_)
69 target_handler_->OnScrollEvent(event); 70 target_handler_->OnScrollEvent(event);
70 } 71 }
71 72
72 void EventTarget::OnTouchEvent(TouchEvent* event) { 73 void EventTarget::OnTouchEvent(TouchEvent* event) {
73 CHECK_EQ(this, event->target()); 74 CHECK_EQ(this, event->target());
(...skipping 26 matching lines...) Expand all
100 while (target) { 101 while (target) {
101 for (EventHandlerList::iterator it = target->post_target_list_.begin(), 102 for (EventHandlerList::iterator it = target->post_target_list_.begin(),
102 end = target->post_target_list_.end(); it != end; ++it) { 103 end = target->post_target_list_.end(); it != end; ++it) {
103 list->push_back(*it); 104 list->push_back(*it);
104 } 105 }
105 target = target->GetParentTarget(); 106 target = target->GetParentTarget();
106 } 107 }
107 } 108 }
108 109
109 } // namespace ui 110 } // 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