ash/root_window_controller.cc - Issue 2072023003: mash: Break ash system tray dependencies on ash::ShelfWidget

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

Issue 2072023003: mash: Break ash system tray dependencies on ash::ShelfWidget (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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/root_window_controller.cc

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

index 44424ac236d59497f7ddc9af69651e51be715316..8fc703ef432f35660d578bace5ed58e57bb0fbcb 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -763,8 +763,8 @@ void RootWindowController::InitLayoutManagers() {

WmWindow* status_container =

WmWindowAura::Get(GetContainer(kShellWindowId_StatusContainer));

shelf_widget_.reset(new ShelfWidget(shelf_container, status_container,

+ wm_shelf_aura_.get(),

workspace_controller()));

- wm_shelf_aura_->SetShelfLayoutManager(shelf_widget_->shelf_layout_manager());

workspace_layout_manager_delegate->set_shelf(

shelf_widget_->shelf_layout_manager());

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