Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1931)

Unified Diff: ash/aura/wm_root_window_controller_aura.cc

Issue 2624613002: Promotes common functions to WmRootWindowController (Closed)
Patch Set: order Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/wm_root_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.cc
diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
index d8bab9208f1876ce06020cadd25ca5eced495fc6..368f3ca76bdd719c7f5fe601f46ef9b41c09d153 100644
--- a/ash/aura/wm_root_window_controller_aura.cc
+++ b/ash/aura/wm_root_window_controller_aura.cc
@@ -13,11 +13,7 @@
#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*);
@@ -77,34 +73,6 @@ 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();
« no previous file with comments | « ash/aura/wm_root_window_controller_aura.h ('k') | ash/common/wm_root_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698