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

Unified Diff: ash/display/screen_position_controller.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/display/screen_ash.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/screen_position_controller.cc
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 6f470625dd8e1f5af48537fd82388ea9f3c772a9..6481c0f78055e0200b622385f730735f39019e71 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -4,10 +4,10 @@
#include "ash/display/screen_position_controller.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/window_positioning_utils.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "ash/wm/window_properties.h"
@@ -104,8 +104,8 @@ void ScreenPositionController::ConvertHostPointToScreen(
aura::Window* root = root_window->GetRootWindow();
aura::Window* target_root = nullptr;
ConvertHostPointToRelativeToRootWindow(
- root, WmWindowAura::ToAuraWindows(WmShell::Get()->GetAllRootWindows()),
- point, &target_root);
+ root, WmWindow::ToAuraWindows(WmShell::Get()->GetAllRootWindows()), point,
+ &target_root);
ConvertPointToScreen(target_root, point);
}
@@ -117,7 +117,7 @@ void ScreenPositionController::SetBounds(aura::Window* window,
return;
}
- wm::SetBoundsInScreen(WmWindowAura::Get(window), bounds, display);
+ wm::SetBoundsInScreen(WmWindow::Get(window), bounds, display);
}
} // namespace ash
« no previous file with comments | « ash/display/screen_ash.cc ('k') | ash/display/window_tree_host_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698