mash/wm/bridge/wm_root_window_controller_mus.cc - Issue 2010473003: Wires up shelf to panel and dock layoutmanagers

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: mash/wm/bridge/wm_root_window_controller_mus.cc

Issue 2010473003: Wires up shelf to panel and dock layoutmanagers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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: mash/wm/bridge/wm_root_window_controller_mus.cc

diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/mash/wm/bridge/wm_root_window_controller_mus.cc

index 658983700221f0fd708d64790bfbb3cfb5ba8f9f..9b01ef22aaaa1321fd29a21a1eeae9d6c3078555 100644

--- a/mash/wm/bridge/wm_root_window_controller_mus.cc

+++ b/mash/wm/bridge/wm_root_window_controller_mus.cc

@@ -106,8 +106,9 @@ void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(

views::Widget* widget,

int shell_container_id,

views::Widget::InitParams* init_params) {

- init_params->parent_mus =

- root_window_controller_->root()->GetChildByLocalId(shell_container_id);

+ init_params->parent_mus = WmWindowMus::GetMusWindow(

+ WmWindowMus::Get(root_window_controller_->root())

+ ->GetChildByShellWindowId(shell_container_id));

DCHECK(init_params->parent_mus);

mus::Window* new_window =

root_window_controller_->root()->connection()->NewWindow();