ash/mus/bridge/wm_root_window_controller_mus.cc - Issue 2203003003: Get AcceleratorControllerTest working with mash

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

Issue 2203003003: Get AcceleratorControllerTest working with mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: feedback 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/bridge/wm_root_window_controller_mus.cc

diff --git a/ash/mus/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc

index 1756b79e5505c1757f710fbeba4bd5f4ddff204a..fe98ba7c5ad47321e8e731d506e8559eceb14720 100644

--- a/ash/mus/bridge/wm_root_window_controller_mus.cc

+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc

@@ -122,7 +122,8 @@ void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(

->GetChildByShellWindowId(shell_container_id));

DCHECK(init_params->parent_mus);

ui::Window* new_window =

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

+ root_window_controller_->root()->window_tree()->NewWindow(

+ &(init_params->mus_properties));

WmWindowMus::Get(new_window)

->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL);

init_params->native_widget = new views::NativeWidgetMus(