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

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

Issue 2726823003: Remove WmLookup. (Closed)
Patch Set: Clean up include and modify comment. Created 3 years, 10 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/common/wm/root_window_finder.cc ('k') | ash/common/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/window_positioning_utils.cc
diff --git a/ash/common/wm/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc
index 075090e397681eff224815a6394474c03ea5462f..babed2f4456c1c9a052f946f5299ca5d6441a038 100644
--- a/ash/common/wm/window_positioning_utils.cc
+++ b/ash/common/wm/window_positioning_utils.cc
@@ -10,10 +10,10 @@
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_event.h"
#include "ash/common/wm/wm_screen_util.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ui/aura/window_tracker.h"
#include "ui/display/display.h"
#include "ui/display/types/display_constants.h"
@@ -47,9 +47,8 @@ bool IsWindowOrAncestorLockedToRoot(const WmWindow* window) {
// the child windows and transient children of the transient children.
void MoveAllTransientChildrenToNewRoot(const display::Display& display,
WmWindow* window) {
- WmWindow* dst_root = WmLookup::Get()
- ->GetRootWindowControllerWithDisplayId(display.id())
- ->GetWindow();
+ WmWindow* dst_root =
+ Shell::GetRootWindowControllerWithDisplayId(display.id())->GetWindow();
for (WmWindow* transient_child : window->GetTransientChildren()) {
const int container_id = transient_child->GetParent()->GetShellWindowId();
DCHECK_GE(container_id, 0);
@@ -139,7 +138,7 @@ void SetBoundsInScreen(WmWindow* window,
if (!window->GetTransientParent() &&
!IsWindowOrAncestorLockedToRoot(window)) {
RootWindowController* dst_root_window_controller =
- WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
+ Shell::GetRootWindowControllerWithDisplayId(display.id());
DCHECK(dst_root_window_controller);
WmWindow* dst_root = dst_root_window_controller->GetWindow();
DCHECK(dst_root);
« no previous file with comments | « ash/common/wm/root_window_finder.cc ('k') | ash/common/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698