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

Unified Diff: ash/wm/window_positioning_utils.cc

Issue 2814243002: Removes a couple more functions from WmWindow (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
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | ash/wm/wm_snap_to_pixel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_positioning_utils.cc
diff --git a/ash/wm/window_positioning_utils.cc b/ash/wm/window_positioning_utils.cc
index 7140703adde25b8607312c43b4f6eade3d3568af..f5e981adf59b52260c852b978a97d74e1b5fb62d 100644
--- a/ash/wm/window_positioning_utils.cc
+++ b/ash/wm/window_positioning_utils.cc
@@ -50,7 +50,7 @@ void MoveAllTransientChildrenToNewRoot(const display::Display& display,
WmWindow* dst_root =
Shell::GetRootWindowControllerWithDisplayId(display.id())->GetWindow();
for (WmWindow* transient_child : window->GetTransientChildren()) {
- const int container_id = transient_child->GetParent()->GetShellWindowId();
+ const int container_id = transient_child->GetParent()->aura_window()->id();
DCHECK_GE(container_id, 0);
WmWindow* container = dst_root->GetChildByShellWindowId(container_id);
const gfx::Rect transient_child_bounds_in_screen =
@@ -144,7 +144,7 @@ void SetBoundsInScreen(WmWindow* window,
DCHECK(dst_root);
WmWindow* dst_container = nullptr;
if (dst_root != window->GetRootWindow()) {
- int container_id = window->GetParent()->GetShellWindowId();
+ int container_id = window->GetParent()->aura_window()->id();
// All containers that uses screen coordinates must have valid window ids.
DCHECK_GE(container_id, 0);
// Don't move modal background.
« no previous file with comments | « ash/wm/system_modal_container_layout_manager.cc ('k') | ash/wm/wm_snap_to_pixel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698