components/mus/ws/display.cc - Issue 1882423004: Move shell service to toplevel shell namespace

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: components/mus/ws/display.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 8 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: components/mus/ws/display.cc

diff --git a/components/mus/ws/display.cc b/components/mus/ws/display.cc

index b9344aa02e88ed61c92b610384a856a03ca9e382..d2b04992cc837c67c8195b4784eae8c2133f4423 100644

--- a/components/mus/ws/display.cc

+++ b/components/mus/ws/display.cc

@@ -255,8 +255,7 @@ void Display::InitWindowManagersIfNecessary() {

WindowManagerState* wms = wms_ptr.get();

// For this case we never create additional WindowManagerStates, so any

// id works.

- window_manager_state_map_[mojo::shell::mojom::kRootUserID] =

- std::move(wms_ptr);

+ window_manager_state_map_[shell::mojom::kRootUserID] = std::move(wms_ptr);

wms->tree_ = binding_->CreateWindowTree(wms->root());

} else {

CreateWindowManagerStatesFromRegistry();