ash/common/wm/workspace_controller.cc - Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf

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/common/wm/workspace_controller.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)

Patch Set: review comments Created 4 years, 4 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/common/wm/workspace_controller.cc

diff --git a/ash/common/wm/workspace_controller.cc b/ash/common/wm/workspace_controller.cc

index e29732631f133cbdc46150f24df116e5a6f6bd4d..af1f488d6fa3eb5aed284b70f497342ed436c045 100644

--- a/ash/common/wm/workspace_controller.cc

+++ b/ash/common/wm/workspace_controller.cc

@@ -64,8 +64,7 @@ wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {

const int kWindowContainerIds[] = {

kShellWindowId_DefaultContainer, kShellWindowId_DockedContainer,

};

- const gfx::Rect shelf_bounds(

- viewport_->GetRootWindowController()->GetShelf()->GetIdealBounds());

+ const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds());

bool window_overlaps_launcher = false;

for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {

WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(