Changes to quick_launch and font_services

mash/quick_launch/BUILD.gn

Index: mash/quick_launch/BUILD.gn
diff --git a/mash/quick_launch/BUILD.gn b/mash/quick_launch/BUILD.gn
index edd723973781627d465339aa10f3a5c54757a04c..b46475a492803911a7c185357de18d084c1fa11b 100644
--- a/mash/quick_launch/BUILD.gn
+++ b/mash/quick_launch/BUILD.gn
@@ -8,23 +8,35 @@ import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/repack.gni")
 
-mojo_native_application("quick_launch") {
+source_set("lib") {
   sources = [
-    "quick_launch.cc",
+    "quick_launch_application.cc",
+    "quick_launch_application.h",
   ]
 
   deps = [
-    ":manifest",
     "//base",
     "//mojo/public/cpp/bindings",
     "//mojo/services/tracing/public/cpp",
     "//mojo/shell/public/cpp",
-    "//mojo/shell/public/cpp:sources",
     "//mojo/shell/public/interfaces",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
     "//url",
   ]
+}
+
+mojo_native_application("quick_launch") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    ":lib",
+    ":manifest",
+    "//mojo/shell/public/cpp",
+    "//ui/views/mus:for_mojo_application",
+  ]
 
   resources = [ "$root_out_dir/views_mus_resources.pak" ]