Promotes common functions to WmRootWindowController

ash/aura/wm_root_window_controller_aura.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/aura/wm_root_window_controller_aura.h"
 
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_property.h"
-#include "ui/aura/window_tree_host.h"
-#include "ui/events/event_targeter.h"
-#include "ui/events/event_utils.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::WmRootWindowControllerAura*);
 
 namespace ash {
 
 // TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::WmRootWindowControllerAura,
                                  kWmRootWindowControllerKey,
                                  nullptr);
 
@@ skipping 39 matching lines @@
 }
 
 WmShelf* WmRootWindowControllerAura::GetShelf() {
   return root_window_controller_->wm_shelf();
 }
 
 WmWindow* WmRootWindowControllerAura::GetWindow() {
   return WmWindowAura::Get(root_window_controller_->GetRootWindow());
 }
 
-void WmRootWindowControllerAura::ConfigureWidgetInitParamsForContainer(
-    views::Widget* widget,
-    int shell_container_id,
-    views::Widget::InitParams* init_params) {
-  init_params->parent = Shell::GetContainer(
-      root_window_controller_->GetRootWindow(), shell_container_id);
-}
-
-WmWindow* WmRootWindowControllerAura::FindEventTarget(
-    const gfx::Point& location_in_screen) {
-  gfx::Point location_in_root =
-      GetWindow()->ConvertPointFromScreen(location_in_screen);
-  aura::Window* root = root_window_controller_->GetRootWindow();
-  ui::MouseEvent test_event(ui::ET_MOUSE_MOVED, location_in_root,
-                            location_in_root, ui::EventTimeForNow(),
-                            ui::EF_NONE, ui::EF_NONE);
-  ui::EventTarget* event_handler = static_cast<ui::EventTarget*>(root)
-                                       ->GetEventTargeter()
-                                       ->FindTargetForEvent(root, &test_event);
-  return WmWindowAura::Get(static_cast<aura::Window*>(event_handler));
-}
-
-gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
-  return root_window_controller_->GetHost()
-      ->dispatcher()
-      ->GetLastMouseLocationInRoot();
-}
-
 void WmRootWindowControllerAura::OnInitialWallpaperAnimationStarted() {
   root_window_controller_->OnInitialWallpaperAnimationStarted();
   WmRootWindowController::OnInitialWallpaperAnimationStarted();
 }
 
 void WmRootWindowControllerAura::OnWallpaperAnimationFinished(
     views::Widget* widget) {
   root_window_controller_->OnWallpaperAnimationFinished(widget);
   WmRootWindowController::OnWallpaperAnimationFinished(widget);
 }
 
 bool WmRootWindowControllerAura::ShouldDestroyWindowInCloseChildWindows(
     WmWindow* window) {
   return WmWindowAura::GetAuraWindow(window)->owned_by_parent();
 }
 
 }  // namespace ash