ash: Move ShelfWindowTargeter construction from ShelfWidget to RootWindowController

ash/shelf/shelf_widget.cc

Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index f582e8bd34a37e51d6fd067f7f524a67d57e9c36..f67d85e0fd86989046541aa905e76360989fbf5f 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -5,7 +5,6 @@
 #include "ash/shelf/shelf_widget.h"
 
 #include "ash/aura/wm_shelf_aura.h"
-#include "ash/aura/wm_window_aura.h"
 #include "ash/common/focus_cycler.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ -18,16 +17,15 @@
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/shelf/dimmer_view.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_window_targeter.h"
 #include "ash/shell.h"
 #include "ash/wm/status_area_layout_manager.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/memory/ptr_util.h"
 #include "grit/ash_resources.h"
-#include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
@@ -325,11 +323,6 @@ ShelfWidget::ShelfWidget(WmWindow* shelf_container,
   status_container->SetLayoutManager(
       base::MakeUnique<StatusAreaLayoutManager>(this));
 
-  WmWindowAura::GetAuraWindow(shelf_container)->SetEventTargeter(
-      base::MakeUnique<ShelfWindowTargeter>(shelf_container, wm_shelf_aura_));
-  WmWindowAura::GetAuraWindow(status_container)->SetEventTargeter(
-      base::MakeUnique<ShelfWindowTargeter>(status_container, wm_shelf_aura_));
-
   views::Widget::AddObserver(this);
 }