components/view_manager/view_manager_root_impl.cc - Issue 1245683004: Mandoline: Merge Surfaces and Views apps

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/view_manager/view_manager_root_impl.cc

Issue 1245683004: Mandoline: Merge Surfaces and Views apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed bot issues (I hope) Created 5 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: components/view_manager/view_manager_root_impl.cc

diff --git a/components/view_manager/view_manager_root_impl.cc b/components/view_manager/view_manager_root_impl.cc

index 86e740b4bed4bd832f6d19b5851cd741ef9e3b5a..a162747855acb6f781fd38ae5de772a4817a739e 100644

--- a/components/view_manager/view_manager_root_impl.cc

+++ b/components/view_manager/view_manager_root_impl.cc

@@ -16,11 +16,15 @@ ViewManagerRootImpl::ViewManagerRootImpl(

ConnectionManager* connection_manager,

bool is_headless,

mojo::ApplicationImpl* app_impl,

- const scoped_refptr<gles2::GpuState>& gpu_state)

+ const scoped_refptr<gles2::GpuState>& gpu_state,

+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state)

: delegate_(nullptr),

connection_manager_(connection_manager),

display_manager_(

- DisplayManager::Create(is_headless, app_impl, gpu_state)) {

+ DisplayManager::Create(is_headless,

+ app_impl,

+ gpu_state,

+ surfaces_state)) {

display_manager_->Init(this);

}