| 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 import("//services/service_manager/public/service_manifest.gni") | 5 import("//services/service_manager/public/service_manifest.gni") | 
| 6 | 6 | 
| 7 source_set("mash") { | 7 source_set("mash") { | 
| 8   sources = [ | 8   sources = [ | 
| 9     "mash_runner.cc", | 9     "mash_runner.cc", | 
| 10     "mash_runner.h", | 10     "mash_runner.h", | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 36   } | 36   } | 
| 37 } | 37 } | 
| 38 | 38 | 
| 39 service_manifest("mash_manifest") { | 39 service_manifest("mash_manifest") { | 
| 40   name = "chrome_mash" | 40   name = "chrome_mash" | 
| 41   source = "chrome_mash_manifest.json" | 41   source = "chrome_mash_manifest.json" | 
| 42   deps = [ | 42   deps = [ | 
| 43     "//ash/autoclick/mus:manifest", | 43     "//ash/autoclick/mus:manifest", | 
| 44     "//ash/mus:manifest", | 44     "//ash/mus:manifest", | 
| 45     "//ash/touch_hud/mus:manifest", | 45     "//ash/touch_hud/mus:manifest", | 
| 46     "//mash/app_driver:manifest", |  | 
| 47     "//mash/quick_launch:manifest", | 46     "//mash/quick_launch:manifest", | 
| 48     "//mash/session:manifest", | 47     "//mash/session:manifest", | 
| 49     "//mash/task_viewer:manifest", | 48     "//mash/task_viewer:manifest", | 
| 50     "//services/ui:manifest", | 49     "//services/ui:manifest", | 
| 51     "//services/ui/ime/test_ime_driver:manifest", | 50     "//services/ui/ime/test_ime_driver:manifest", | 
| 52   ] | 51   ] | 
| 53   packaged_services = [ | 52   packaged_services = [ | 
| 54     "accessibility_autoclick", | 53     "accessibility_autoclick", | 
| 55     "app_driver", |  | 
| 56     "ash", | 54     "ash", | 
| 57     "mash_session", | 55     "mash_session", | 
| 58     "quick_launch", | 56     "quick_launch", | 
| 59     "task_viewer", | 57     "task_viewer", | 
| 60     "test_ime_driver", | 58     "test_ime_driver", | 
| 61     "touch_hud", | 59     "touch_hud", | 
| 62     "ui", | 60     "ui", | 
| 63   ] | 61   ] | 
| 64 | 62 | 
| 65   if (is_linux && !is_android) { | 63   if (is_linux && !is_android) { | 
| 66     deps += [ "//components/font_service:manifest" ] | 64     deps += [ "//components/font_service:manifest" ] | 
| 67     packaged_services += [ "font_service" ] | 65     packaged_services += [ "font_service" ] | 
| 68   } | 66   } | 
| 69 } | 67 } | 
| 70 | 68 | 
| 71 service_manifest("browser_manifest") { | 69 service_manifest("browser_manifest") { | 
| 72   name = "content_browser" | 70   name = "content_browser" | 
| 73   source = "${root_out_dir}/Packages/chrome_content_browser/manifest.json" | 71   source = "${root_out_dir}/Packages/chrome_content_browser/manifest.json" | 
| 74   output_name = "chrome_mash_content_browser" | 72   output_name = "chrome_mash_content_browser" | 
| 75   deps = [ | 73   deps = [ | 
| 76     "//chrome/app:chrome_content_browser_manifest", | 74     "//chrome/app:chrome_content_browser_manifest", | 
| 77   ] | 75   ] | 
| 78   overlays = [ "chrome_mash_content_browser_manifest_overlay.json" ] | 76   overlays = [ "chrome_mash_content_browser_manifest_overlay.json" ] | 
| 79 } | 77 } | 
| OLD | NEW | 
|---|