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

Unified Diff: ash/display/screen_position_controller.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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
Index: ash/display/screen_position_controller.cc
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 7bd9c9ba9fdb2a1e00ce84b44e858107b7358e05..1bfd49ec2fa1361c687a4a08e4755ce5fedcc344 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -6,10 +6,10 @@
#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_shell.h"
#include "ash/wm_window.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -104,8 +104,8 @@ void ScreenPositionController::ConvertHostPointToScreen(
aura::Window* root = root_window->GetRootWindow();
aura::Window* target_root = nullptr;
ConvertHostPointToRelativeToRootWindow(
- root, WmWindow::ToAuraWindows(WmShell::Get()->GetAllRootWindows()), point,
- &target_root);
+ root, WmWindow::ToAuraWindows(ShellPort::Get()->GetAllRootWindows()),
+ point, &target_root);
ConvertPointToScreen(target_root, point);
}

Powered by Google App Engine
This is Rietveld 408576698