Mus Demo: Extract code specific to internal mode into a separate class

services/ui/demo/BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//services/service_manager/public/tools/test/service_test.gni")
 import("//testing/test.gni")
 
 source_set("lib") {
   sources = [
     "mus_demo.cc",
     "mus_demo.h",
+    "mus_demo_internal.cc",
+    "mus_demo_internal.h",
   ]
 
   public_deps = [
     "//services/service_manager/public/cpp:sources",
     "//skia",
   ]
 
   deps = [
     "//base",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
     "//services/ui/public/cpp",
     "//services/ui/public/cpp:internal",
     "//services/ui/public/interfaces",
     "//ui/aura",
     "//ui/aura_extra",
     "//ui/gfx/geometry",
     "//ui/wm",
   ]
 }
 
-service("mus_demo") {
+service("mus_demo_internal") {

[kylechar, 2017/02/14 18:40:11]

I'm not a big fan of these file and GN target renames from mus_demo to
mus_demo_internal. Wouldn't it make more sense for demo to work in internal
window mode if is_chromeos=true and external window mode if not? That way you
keep  mus_demo targets the same but compile the correct version?

[fwang, 2017/02/14 20:47:28]

I initially wanted to keep all in one class but it seems cleaner to have
separate subclasses (e.g. for the window manager specific stuff). But maybe you
only mean to do the conditional build in the main.cc? I guess that will work, as
long as we do not care about testing both external & internal on a platform.

[fwang, 2017/02/15 13:49:26]

Done.

   sources = [
-    "main.cc",
+    "main_internal.cc",
   ]
 
   deps = [
     ":lib",
   ]
 
   data_deps = [
     "//services/ui",
   ]
 }
 
-service_manifest("manifest") {
-  name = "mus_demo"
-  source = "manifest.json"
+service_manifest("manifest_internal") {
+  name = "mus_demo_internal"
+  source = "manifest_internal.json"
 }
 
 service_manifest("test_manifest") {
   name = "mus_demo_unittests"
   source = "test_manifest.json"
 }
 
 service_test("mus_demo_unittests") {
   testonly = true
 
   sources = [
     "mus_demo_unittests.cc",
   ]
 
   catalog = ":mus_demo_unittests_catalog"
 
   deps = [
     ":demo",
     "//base",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
     "//services/ui/public/interfaces",
     "//testing/gtest",
   ]
 
   data_deps = [
-    ":mus_demo",
+    ":mus_demo_internal",
   ]
 }
 
 group("demo") {
   deps = [
-    ":mus_demo",
+    ":mus_demo_internal",
   ]
 }
 
 catalog("mus_demo_unittests_catalog") {
   embedded_services = [ ":test_manifest" ]
 
   standalone_services = [
-    ":manifest",
+    ":manifest_internal",
     "//services/ui:manifest",
   ]
 }