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

Unified Diff: ash/display/screen_position_controller.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 7 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
Index: ash/display/screen_position_controller.cc
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 6b5da7c7e6ec4fed3fe45719c8cdca17ffa268a3..ac3d906ca7126246a55188015e684af9633043fa 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -6,11 +6,9 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/shell_port.h"
#include "ash/wm/window_positioning_utils.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/compositor/dip_util.h"
@@ -103,9 +101,8 @@ void ScreenPositionController::ConvertHostPointToScreen(
gfx::Point* point) {
aura::Window* root = root_window->GetRootWindow();
aura::Window* target_root = nullptr;
- ConvertHostPointToRelativeToRootWindow(
- root, WmWindow::ToAuraWindows(ShellPort::Get()->GetAllRootWindows()),
- point, &target_root);
+ ConvertHostPointToRelativeToRootWindow(root, Shell::GetAllRootWindows(),
+ point, &target_root);
ConvertPointToScreen(target_root, point);
}
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698