ash/wm/workspace_controller.cc - Issue 2886253002: mash: remove more shell/shelf WmWindow usage.

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_controller.cc

Issue 2886253002: mash: remove more shell/shelf WmWindow usage. (Closed)

Patch Set: Fix WmShelf::ForWindow. Created 3 years, 7 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_controller.cc

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

index 65b3570c2304f1603965e62b58d79c995eaac61b..bc553a7a1bf02e777faab82bd2345bf6b363988c 100644

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

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

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

if (fullscreen && !wm::GetWindowState(fullscreen)->ignored_by_shelf())

return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;

- const gfx::Rect shelf_bounds(

- WmShelf::ForWindow(WmWindow::Get(viewport_))->GetIdealBounds());

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

bool window_overlaps_launcher = false;

// The default container may contain windows that may overlap the launcher

// shelf and affect its transparency.