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

Unified Diff: ash/wm/common/root_window_finder.cc

Issue 1898223002: Removes most aura dependencies from WindowResizer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_aura_from_window_state
Patch Set: nit and merge Created 4 years, 8 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/wm/common/root_window_finder.h ('k') | ash/wm/common/wm_globals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/common/root_window_finder.cc
diff --git a/ash/wm/coordinate_conversion.cc b/ash/wm/common/root_window_finder.cc
similarity index 50%
rename from ash/wm/coordinate_conversion.cc
rename to ash/wm/common/root_window_finder.cc
index e591f3f1b6e8b664307a6c4d2cfbcfc207c93f33..69b2f99da6afce035395b49ef5f6e963f812a48e 100644
--- a/ash/wm/coordinate_conversion.cc
+++ b/ash/wm/common/root_window_finder.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/coordinate_conversion.h"
+#include "ash/wm/common/root_window_finder.h"
#include "ash/display/window_tree_host_manager.h"
-#include "ash/shell.h"
-#include "ui/aura/client/screen_position_client.h"
+#include "ash/wm/common/wm_root_window_controller.h"
+#include "ash/wm/common/wm_window.h"
#include "ui/gfx/display.h"
#include "ui/gfx/geometry/point.h"
#include "ui/gfx/geometry/rect.h"
@@ -15,23 +15,21 @@
namespace ash {
namespace wm {
-aura::Window* GetRootWindowAt(const gfx::Point& point) {
+WmWindow* GetRootWindowAt(const gfx::Point& point) {
const gfx::Display& display =
gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
DCHECK(display.is_valid());
- // TODO(yusukes): Move coordinate_conversion.cc and .h to ui/aura/ once
- // GetRootWindowForDisplayId() is moved to aura::Env.
- return Shell::GetInstance()
- ->window_tree_host_manager()
- ->GetRootWindowForDisplayId(display.id());
+ WmRootWindowController* root_window_controller =
+ WmRootWindowController::GetWithDisplayId(display.id());
+ return root_window_controller ? root_window_controller->GetWindow() : nullptr;
}
-aura::Window* GetRootWindowMatching(const gfx::Rect& rect) {
+WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
const gfx::Display& display =
gfx::Screen::GetScreen()->GetDisplayMatching(rect);
- return Shell::GetInstance()
- ->window_tree_host_manager()
- ->GetRootWindowForDisplayId(display.id());
+ WmRootWindowController* root_window_controller =
+ WmRootWindowController::GetWithDisplayId(display.id());
+ return root_window_controller ? root_window_controller->GetWindow() : nullptr;
}
} // namespace wm
« no previous file with comments | « ash/wm/common/root_window_finder.h ('k') | ash/wm/common/wm_globals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698