components/mus/ws/window_manager_state.cc - Issue 1766943002: Refators display related functionality into own class

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

Issue 1766943002: Refators display related functionality into own class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 9 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: components/mus/ws/window_manager_state.cc

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

index f017dca62f985dccdf42e0fbfc3a3cfe055be22d..53879eca59e3089e6e29f2cbdf581fd19bd3cdb6 100644

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

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

@@ -5,6 +5,7 @@

#include "components/mus/ws/window_manager_state.h"

#include "components/mus/ws/connection_manager.h"

+#include "components/mus/ws/display_manager.h"

#include "components/mus/ws/server_window.h"

#include "mojo/shell/public/interfaces/connector.mojom.h"

@@ -27,7 +28,7 @@ WindowManagerState::WindowManagerState(Display* display,

user_id_(user_id) {

ConnectionManager* connection_manager = display_->connection_manager();

root_.reset(connection_manager->CreateServerWindow(

- RootWindowId(connection_manager->GetAndAdvanceNextRootId()),

+ connection_manager->display_manager()->GetAndAdvanceNextRootId(),

ServerWindow::Properties()));

// Our root is always a child of the Display's root. Do this

// before the WindowTree has been created so that the client doesn't get

« no previous file with comments | « components/mus/ws/test_utils.cc ('k') | components/mus/ws/window_tree.h » ('j') | no next file with comments »