Refactors away method implementations in ui::EventTargeter

ash/wm/resize_handle_window_targeter.cc

Index: ash/wm/resize_handle_window_targeter.cc
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc
index 28bd0e2ebe5df68821c882592eee566a4b20a019..9804c0c1764723351188c8187d98cdf623d53899 100644
--- a/ash/wm/resize_handle_window_targeter.cc
+++ b/ash/wm/resize_handle_window_targeter.cc
@@ -8,6 +8,7 @@
 #include "ash/wm/immersive_fullscreen_controller.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/window.h"
+#include "ui/events/event.h"
 
 namespace ash {
 
@@ -48,10 +49,9 @@ void ResizeHandleWindowTargeter::OnWindowDestroying(aura::Window* window) {
   window_ = NULL;
 }
 
-ui::EventTarget* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
-    ui::EventTarget* root,
+aura::Window* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
+    aura::Window* window,
     ui::LocatedEvent* event) {
-  aura::Window* window = static_cast<aura::Window*>(root);
   if (window == window_) {
     gfx::Insets insets;
     if (immersive_controller_ && immersive_controller_->IsEnabled() &&
@@ -77,23 +77,25 @@ ui::EventTarget* ResizeHandleWindowTargeter::FindTargetForLocatedEvent(
         return window_;
     }
   }
-  return aura::WindowTargeter::FindTargetForLocatedEvent(root, event);
+  return aura::WindowTargeter::FindTargetForLocatedEvent(window, event);
 }
 
 bool ResizeHandleWindowTargeter::SubtreeShouldBeExploredForEvent(
-    ui::EventTarget* target,
+    aura::Window* window,
     const ui::LocatedEvent& event) {
-  if (target == window_) {
+  if (window == window_) {
     // Defer to the parent's targeter on whether |window_| should be able to
     // receive the event.
-    ui::EventTarget* parent = target->GetParentTarget();
+    ui::EventTarget* parent =
+        static_cast<ui::EventTarget*>(window)->GetParentTarget();
     if (parent) {
-      ui::EventTargeter* targeter = parent->GetEventTargeter();
+      WindowTargeter* targeter =

[tdanderson, 2015/05/22 18:29:56]

aura::WindowTargeter? (as as done on line 80)

[varkha, 2015/05/22 22:18:34]

Done.

+          static_cast<WindowTargeter*>(parent->GetEventTargeter());
       if (targeter)
-        return targeter->SubtreeShouldBeExploredForEvent(target, event);
+        return targeter->SubtreeShouldBeExploredForEvent(window, event);
     }
   }
-  return aura::WindowTargeter::SubtreeShouldBeExploredForEvent(target, event);
+  return aura::WindowTargeter::SubtreeShouldBeExploredForEvent(window, event);
 }

[tdanderson, 2015/05/22 18:29:56]

Side question: have you tried this on device as a sanity check to make sure
targeting still works as intended?

[varkha, 2015/05/22 22:18:34]

No, not yet. So far I don't think there should be any semantic changes. I have
tried in simulation, in particular I've tried the cases around resizing a window
next to the shelf or next to the other windows.

 
 }  // namespace ash