ash/aura/wm_root_window_controller_aura.cc - Issue 2041583004: mash: Move WmShelfAura ownership to RootWindowController and init it earlier

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/aura/wm_root_window_controller_aura.cc

Issue 2041583004: mash: Move WmShelfAura ownership to RootWindowController and init it earlier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelftypes

Patch Set: . Created 4 years, 6 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/aura/wm_root_window_controller_aura.cc

diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc

index b632635ff7f2bc02246da2405cd5226d685a52e1..8096034a39afc9b9186dde6778708a5333b1c76e 100644

--- a/ash/aura/wm_root_window_controller_aura.cc

+++ b/ash/aura/wm_root_window_controller_aura.cc

@@ -78,9 +78,7 @@ AlwaysOnTopController* WmRootWindowControllerAura::GetAlwaysOnTopController() {

}

WmShelf* WmRootWindowControllerAura::GetShelf() {

- return root_window_controller_->shelf_widget()

- ? root_window_controller_->shelf_widget()->shelf()->wm_shelf()

- : nullptr;

+ return root_window_controller_->wm_shelf_aura();

}

WmWindow* WmRootWindowControllerAura::GetWindow() {

« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.h » ('j') | no next file with comments »