services/ui/demo/main.cc - Issue 2622103004: Mus Demo: Demonstrate external window mode

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: services/ui/demo/main.cc

Issue 2622103004: Mus Demo: Demonstrate external window mode (Closed)

Patch Set: Only disable the assert in external mode for now. Created 3 years, 10 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "services/service_manager/public/c/main.h"	5 #include "services/service_manager/public/c/main.h"

6 #include "services/service_manager/public/cpp/service_runner.h"	6 #include "services/service_manager/public/cpp/service_runner.h"

	7 #if defined(USE_OZONE) && !defined(OS_CHROMEOS)
	kylechar 2017/02/21 15:15:10 It would probably be cleaner to have a main_intern It would probably be cleaner to have a main_internal.cc and main_external.cc after looking at this. fwang 2017/02/21 17:30:18 Done. Show quoted text On 2017/02/21 15:15:10, kylechar wrote: > It would probably be cleaner to have a main_internal.cc and main_external.cc > after looking at this. Done.
	8 #include "services/ui/demo/mus_demo_external.h"

	9 #else

7 #include "services/ui/demo/mus_demo_internal.h"	10 #include "services/ui/demo/mus_demo_internal.h"

	11 #endif

8	12

9 MojoResult ServiceMain(MojoHandle service_request_handle) {	13 MojoResult ServiceMain(MojoHandle service_request_handle) {

	14 #if defined(USE_OZONE) && !defined(OS_CHROMEOS)

	15 service_manager::ServiceRunner runner(new ui::demo::MusDemoExternal);

	16 #else

10 service_manager::ServiceRunner runner(new ui::demo::MusDemoInternal);	17 service_manager::ServiceRunner runner(new ui::demo::MusDemoInternal);

	18 #endif

11 return runner.Run(service_request_handle);	19 return runner.Run(service_request_handle);

12 }	20 }

OLD	NEW

« no previous file with comments | « services/ui/demo/BUILD.gn ('k') | services/ui/demo/manifest.json » ('j') | services/ui/demo/mus_demo_external.h » ('J')