ash/mus/root_window_controller.cc - Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it

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/mus/root_window_controller.cc

Issue 2304443002: ash: Move ShelfWidget ownership to WmShelf and refactor access to it (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/mus/root_window_controller.cc

diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc

index 46ceb10a0b9cc54d1e93b887010c34d172145376..f9584af0e17b02428c77c52f56eab04970270d7f 100644

--- a/ash/mus/root_window_controller.cc

+++ b/ash/mus/root_window_controller.cc

@@ -170,7 +170,7 @@ void RootWindowController::CreateLayoutManagers() {

new ScreenlockLayout(lock_screen_container->mus_window()));

// Creating the shelf also creates the status area and both layout managers.

- wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_.get()));

+ wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_->GetWindow()));

WmWindowMus* default_container =

GetWindowByShellWindowId(kShellWindowId_DefaultContainer);

« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/root_window_controller.h » ('j') | no next file with comments »