ash/wm/workspace/workspace_layout_manager.cc - Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/workspace/workspace_layout_manager.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 2 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:

Index: ash/wm/workspace/workspace_layout_manager.cc

diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc

index 3a313b2b591fa37276c2dcecd3a5d18c46657abe..cfe77ff608eb4a4f25c52a8cbdd8f263228161ec 100644

--- a/ash/wm/workspace/workspace_layout_manager.cc

+++ b/ash/wm/workspace/workspace_layout_manager.cc

@@ -55,7 +55,7 @@ void MoveToDisplayForRestore(wm::WindowState* window_state) {

Shell::GetInstance()->display_controller();

const gfx::Display& display =

display_controller->GetDisplayMatching(restore_bounds);

- aura::RootWindow* new_root =

+ aura::Window* new_root =

display_controller->GetRootWindowForDisplayId(display.id());

if (new_root != window_state->window()->GetRootWindow()) {

aura::Window* new_container =