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

Unified Diff: ui/views/view.cc

Issue 354063003: View should store a ViewTargeter instead of an EventTargeter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: compilation errors Created 6 years, 6 months 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 15c78dec8f928ae56e4c655ea48a0f25008503c9..58d7280e150e438710be09e322e569af43a79017 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1101,9 +1101,9 @@ const InputMethod* View::GetInputMethod() const {
return widget ? widget->GetInputMethod() : NULL;
}
-scoped_ptr<ui::EventTargeter>
-View::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {
- scoped_ptr<ui::EventTargeter> old_targeter = targeter_.Pass();
+scoped_ptr<ViewTargeter>
+View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
+ scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass();
targeter_ = targeter.Pass();
return old_targeter.Pass();
}
@@ -1121,6 +1121,10 @@ scoped_ptr<ui::EventTargetIterator> View::GetChildIterator() const {
new ui::EventTargetIteratorImpl<View>(children_));
}
+ViewTargeter* View::GetViewTargeter() const {
+ return targeter_.get();
+}
+
ui::EventTargeter* View::GetEventTargeter() {
return targeter_.get();
}
« ui/views/view.h ('K') | « ui/views/view.h ('k') | ui/views/view_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698