Promotes common functions to WmRootWindowController

ash/common/wm_root_window_controller.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/common/wm_root_window_controller.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/wallpaper/wallpaper_delegate.h"
 #include "ash/common/wallpaper/wallpaper_widget_controller.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/lock_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #include "ash/common/wm/root_window_layout_manager.h"
 #include "ash/common/wm/system_modal_container_layout_manager.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/memory/ptr_util.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
+#include "ui/aura/window_tree_host.h"
 #include "ui/base/models/menu_model.h"
+#include "ui/events/event_targeter.h"
+#include "ui/events/event_utils.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace ash {
 namespace {
 
 // Scales |value| that is originally between 0 and |src_max| to be between
 // 0 and |dst_max|.
 float ToRelativeValue(int value, int src_max, int dst_max) {
   return static_cast<float>(value) / static_cast<float>(src_max) * dst_max;
@@ skipping 182 matching lines @@
 }
 
 WmWindow* WmRootWindowController::GetContainer(int container_id) {
   return root_->GetChildByShellWindowId(container_id);
 }
 
 const WmWindow* WmRootWindowController::GetContainer(int container_id) const {
   return root_->GetChildByShellWindowId(container_id);
 }
 
+void WmRootWindowController::ConfigureWidgetInitParamsForContainer(
+    views::Widget* widget,
+    int shell_container_id,
+    views::Widget::InitParams* init_params) {
+  init_params->parent = WmWindowAura::GetAuraWindow(
+      GetWindow()->GetChildByShellWindowId(shell_container_id));
+}
+
+gfx::Point WmRootWindowController::GetLastMouseLocationInRoot() {

[msw, 2017/01/09 23:26:48]

nit: match function decl order

[sky, 2017/01/09 23:39:11]

Done.

+  return WmWindowAura::GetAuraWindow(GetWindow())
+      ->GetHost()
+      ->dispatcher()
+      ->GetLastMouseLocationInRoot();
+}
+
+WmWindow* WmRootWindowController::FindEventTarget(
+    const gfx::Point& location_in_screen) {
+  gfx::Point location_in_root =
+      GetWindow()->ConvertPointFromScreen(location_in_screen);
+  aura::Window* root = WmWindowAura::GetAuraWindow(GetWindow());
+  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));
+}
+
 void WmRootWindowController::ShowContextMenu(
     const gfx::Point& location_in_screen,
     ui::MenuSourceType source_type) {
   ShellDelegate* delegate = WmShell::Get()->delegate();
   DCHECK(delegate);
   menu_model_.reset(delegate->CreateContextMenu(GetShelf(), nullptr));
   if (!menu_model_)
     return;
 
   menu_model_adapter_.reset(new views::MenuModelAdapter(
@@ skipping 340 matching lines @@
 }
 
 void WmRootWindowController::OnMenuClosed() {
   menu_runner_.reset();
   menu_model_adapter_.reset();
   menu_model_.reset();
   GetShelf()->UpdateVisibilityState();
 }
 
 }  // namespace ash