Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified 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 side-by-side diff with in-line comments
Download patch
Index: services/ui/demo/main.cc
diff --git a/services/ui/demo/main.cc b/services/ui/demo/main.cc
index 20142861370e555eba103c3038c4af28c8b43136..f619c31f2fa686e2d29f06db352fb2f35310138c 100644
--- a/services/ui/demo/main.cc
+++ b/services/ui/demo/main.cc
@@ -4,9 +4,17 @@
#include "services/service_manager/public/c/main.h"
#include "services/service_manager/public/cpp/service_runner.h"
+#if defined(USE_OZONE) && !defined(OS_CHROMEOS)
kylechar 2017/02/21 15:15:10 It would probably be cleaner to have a main_intern
fwang 2017/02/21 17:30:18 Done.
+#include "services/ui/demo/mus_demo_external.h"
+#else
#include "services/ui/demo/mus_demo_internal.h"
+#endif
MojoResult ServiceMain(MojoHandle service_request_handle) {
+#if defined(USE_OZONE) && !defined(OS_CHROMEOS)
+ service_manager::ServiceRunner runner(new ui::demo::MusDemoExternal);
+#else
service_manager::ServiceRunner runner(new ui::demo::MusDemoInternal);
+#endif
return runner.Run(service_request_handle);
}

Powered by Google App Engine
This is Rietveld 408576698