ash/wm/workspace_controller.h - Issue 1841803002: Cleanup WorkspaceController and WorkspaceLayoutManager.

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.h

Issue 1841803002: Cleanup WorkspaceController and WorkspaceLayoutManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Keep nullptr comparisons. Created 4 years, 9 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

Index: ash/wm/workspace_controller.h

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

index f22b2eaa4ea421a1a1835e1521f366b946f86e72..9df8c275a7ecb71440e4a80cb8e7273680336da6 100644

--- a/ash/wm/workspace_controller.h

+++ b/ash/wm/workspace_controller.h

@@ -31,7 +31,7 @@ class ASH_EXPORT WorkspaceController {

// Returns the current window state.

WorkspaceWindowState GetWindowState() const;

- void SetShelf(ShelfLayoutManager* shelf);

+ void set_shelf(ShelfLayoutManager* shelf) { shelf_ = shelf; }

// Starts the animation that occurs on first login.

void DoInitialAnimation();

« ash/wm/workspace/workspace_layout_manager.cc ('K') | « ash/wm/workspace/workspace_layout_manager.cc ('k') | ash/wm/workspace_controller.cc » ('j') | ash/wm/workspace_controller.cc » ('J')