ash: Remove *LimitedPreTargetHandlerForWindow helper functions

These were added for deprecated Mash architecture plans.
Inline calls to [Add/Remove]PreTargetHandler instead.

Bug: 866529
Test: No shelf tooltip nor double-click-to-resize-window changes.
Change-Id: Ic4d376652e1e128c979cfdb6f5f219a2ed76f6ad
Reviewed-on: https://chromium-review.googlesource.com/1240212Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593628}

ash/shelf/shelf_tooltip_manager.cc

@@ -9,7 +9,6 @@
 #include "ash/shelf/shelf_tooltip_preview_bubble.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
-#include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -41,16 +40,12 @@ ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
 ShelfTooltipManager::~ShelfTooltipManager() {
   Shell::Get()->RemovePointerWatcher(this);
   shelf_view_->shelf()->RemoveObserver(this);
-  aura::Window* window = nullptr;
-  if (shelf_view_->GetWidget())
-    window = shelf_view_->GetWidget()->GetNativeWindow();
-  if (window)
-    wm::RemoveLimitedPreTargetHandlerForWindow(this, window);
+  if (shelf_view_->GetWidget() && shelf_view_->GetWidget()->GetNativeWindow())
+    shelf_view_->GetWidget()->GetNativeWindow()->RemovePreTargetHandler(this);
 }
 
 void ShelfTooltipManager::Init() {
-  wm::AddLimitedPreTargetHandlerForWindow(
-      this, shelf_view_->GetWidget()->GetNativeWindow());
+  shelf_view_->GetWidget()->GetNativeWindow()->AddPreTargetHandler(this);
 }
 
 void ShelfTooltipManager::Close() {

ash/wm/window_util.cc

@@ -247,17 +247,6 @@ void CloseWidgetForWindow(aura::Window* window) {
   widget->Close();
 }
 
-// TODO(sky): investigate removing this entirely. https://crbug.com/842365
-void AddLimitedPreTargetHandlerForWindow(ui::EventHandler* handler,
-                                         aura::Window* window) {
-  window->AddPreTargetHandler(handler);
-}
-
-void RemoveLimitedPreTargetHandlerForWindow(ui::EventHandler* handler,
-                                            aura::Window* window) {
-  window->RemovePreTargetHandler(handler);
-}
-
 void InstallResizeHandleWindowTargeterForWindow(aura::Window* window) {
   window->SetEventTargeter(std::make_unique<InteriorResizeHandleTargeter>());
 }

ash/wm/window_util.h

@@ -20,7 +20,6 @@ class Point;
 
 namespace ui {
 class Event;
-class EventHandler;
 }
 
 namespace ash {
@@ -95,19 +94,6 @@ ASH_EXPORT void SetChildrenUseExtendedHitRegionForWindow(aura::Window* window);
 // forward to an associated widget.
 ASH_EXPORT void CloseWidgetForWindow(aura::Window* window);
 
-// Adds or removes a handler to receive events targeted at this window, before
-// this window handles the events itself; the handler does not receive events
-// from embedded windows. This only supports windows with internal widgets;
-// see ash::GetInternalWidgetForWindow(). Ownership of the handler is not
-// transferred.
-//
-// Also note that the target of these events is always an aura::Window.
-ASH_EXPORT void AddLimitedPreTargetHandlerForWindow(ui::EventHandler* handler,
-                                                    aura::Window* window);
-ASH_EXPORT void RemoveLimitedPreTargetHandlerForWindow(
-    ui::EventHandler* handler,
-    aura::Window* window);
-
 // Installs a resize handler on the window that makes it easier to resize
 // the window.
 ASH_EXPORT void InstallResizeHandleWindowTargeterForWindow(

ash/wm/workspace/workspace_event_handler.cc

@@ -18,12 +18,11 @@ namespace ash {
 
 WorkspaceEventHandler::WorkspaceEventHandler(aura::Window* workspace_window)
     : workspace_window_(workspace_window), click_component_(HTNOWHERE) {
-  // TODO(crbug.com/866529): Convert to AddPreTargetHandler.
-  wm::AddLimitedPreTargetHandlerForWindow(this, workspace_window_);
+  workspace_window_->AddPreTargetHandler(this);
 }
 
 WorkspaceEventHandler::~WorkspaceEventHandler() {
-  wm::RemoveLimitedPreTargetHandlerForWindow(this, workspace_window_);
+  workspace_window_->RemovePreTargetHandler(this);
 }
 
 void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event) {