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

Unified Diff: ash/common/wm/root_window_finder.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/panels/panel_window_resizer.cc ('k') | ash/common/wm/window_positioning_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/root_window_finder.cc
diff --git a/ash/common/wm/root_window_finder.cc b/ash/common/wm/root_window_finder.cc
index bfd32214355b3655ba418cfe5e31642befd64b92..87c2da30fa6a89e1f134bc53952169044f00ec48 100644
--- a/ash/common/wm/root_window_finder.cc
+++ b/ash/common/wm/root_window_finder.cc
@@ -4,9 +4,9 @@
#include "ash/common/wm/root_window_finder.h"
-#include "ash/common/wm_lookup.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
+#include "ash/shell.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/point.h"
@@ -20,7 +20,7 @@ WmWindow* GetRootWindowAt(const gfx::Point& point) {
display::Screen::GetScreen()->GetDisplayNearestPoint(point);
DCHECK(display.is_valid());
RootWindowController* root_window_controller =
- WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
+ Shell::GetRootWindowControllerWithDisplayId(display.id());
return root_window_controller ? root_window_controller->GetWindow() : nullptr;
}
@@ -28,7 +28,7 @@ WmWindow* GetRootWindowMatching(const gfx::Rect& rect) {
const display::Display& display =
display::Screen::GetScreen()->GetDisplayMatching(rect);
RootWindowController* root_window_controller =
- WmLookup::Get()->GetRootWindowControllerWithDisplayId(display.id());
+ Shell::GetRootWindowControllerWithDisplayId(display.id());
return root_window_controller ? root_window_controller->GetWindow() : nullptr;
}
« no previous file with comments | « ash/common/wm/panels/panel_window_resizer.cc ('k') | ash/common/wm/window_positioning_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698