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

services/ui/demo/BUILD.gn

Index: services/ui/demo/BUILD.gn
diff --git a/services/ui/demo/BUILD.gn b/services/ui/demo/BUILD.gn
index 5ff9b1350596d02308749d8b0eb6f2df0be0fcd9..cad0d5570e311c566548a991ab12b44b44ecd4ae 100644
--- a/services/ui/demo/BUILD.gn
+++ b/services/ui/demo/BUILD.gn
@@ -12,6 +12,8 @@ source_set("lib") {
   sources = [
     "mus_demo.cc",
     "mus_demo.h",
+    "mus_demo_internal.cc",
+    "mus_demo_internal.h",
   ]
 
   public_deps = [
@@ -33,9 +35,9 @@ source_set("lib") {
   ]
 }
 
-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 = [
@@ -47,9 +49,9 @@ service("mus_demo") {
   ]
 }
 
-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") {
@@ -76,13 +78,13 @@ service_test("mus_demo_unittests") {
   ]
 
   data_deps = [
-    ":mus_demo",
+    ":mus_demo_internal",
   ]
 }
 
 group("demo") {
   deps = [
-    ":mus_demo",
+    ":mus_demo_internal",
   ]
 }
 
@@ -90,7 +92,7 @@ catalog("mus_demo_unittests_catalog") {
   embedded_services = [ ":test_manifest" ]
 
   standalone_services = [
-    ":manifest",
+    ":manifest_internal",
     "//services/ui:manifest",
   ]
 }