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

Unified Diff: ui/views/view.cc

Issue 426443002: Do not call into EventTargeter methods from ViewTargeter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: added DCHECK Created 6 years, 4 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
« no previous file with comments | « ui/views/view.h ('k') | ui/views/view_targeter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/view.cc
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 290dfdafb8ae40e62332f425caeca4a5c6af9e02..349b0ddbcaa5d9b8ae97176ad97076c36e14eb01 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -1030,6 +1030,15 @@ View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
return old_targeter.Pass();
}
+ViewTargeter* View::GetEffectiveViewTargeter() const {
+ DCHECK(GetWidget());
+ ViewTargeter* view_targeter = targeter();
+ if (!view_targeter)
+ view_targeter = GetWidget()->GetRootView()->targeter();
+ CHECK(view_targeter);
+ return view_targeter;
+}
+
bool View::CanAcceptEvent(const ui::Event& event) {
return IsDrawn();
}
@@ -2270,14 +2279,6 @@ void View::ProcessMouseReleased(const ui::MouseEvent& event) {
// WARNING: we may have been deleted.
}
-ViewTargeter* View::GetEffectiveViewTargeter() const {
- ViewTargeter* view_targeter = targeter();
- if (!view_targeter)
- view_targeter = GetWidget()->GetRootView()->targeter();
- CHECK(view_targeter);
- return view_targeter;
-}
-
// Accelerators ----------------------------------------------------------------
void View::RegisterPendingAccelerators() {
« no previous file with comments | « ui/views/view.h ('k') | ui/views/view_targeter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698