OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
6 import("//chrome/common/features.gni") | 6 import("//chrome/common/features.gni") |
7 import("//ppapi/features/features.gni") | 7 import("//ppapi/features/features.gni") |
8 import("//printing/features/features.gni") | 8 import("//printing/features/features.gni") |
9 import("//services/catalog/public/tools/catalog.gni") | 9 import("//services/catalog/public/tools/catalog.gni") |
10 import("//services/service_manager/public/service_manifest.gni") | 10 import("//services/service_manager/public/service_manifest.gni") |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
386 source = | 386 source = |
387 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" | 387 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" |
388 packaged_services = chrome_packaged_services | 388 packaged_services = chrome_packaged_services |
389 if (is_chromeos) { | 389 if (is_chromeos) { |
390 packaged_services += [ "//ash/mus:manifest" ] | 390 packaged_services += [ "//ash/mus:manifest" ] |
391 } | 391 } |
392 } | 392 } |
393 | 393 |
394 service_manifest("chrome_content_browser_manifest_overlay") { | 394 service_manifest("chrome_content_browser_manifest_overlay") { |
395 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 395 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" |
| 396 packaged_services = [ "//services/preferences:manifest" ] |
396 } | 397 } |
397 | 398 |
398 service_manifest("chrome_content_gpu_manifest_overlay") { | 399 service_manifest("chrome_content_gpu_manifest_overlay") { |
399 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" | 400 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" |
400 } | 401 } |
401 | 402 |
402 service_manifest("chrome_content_plugin_manifest_overlay") { | 403 service_manifest("chrome_content_plugin_manifest_overlay") { |
403 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" | 404 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" |
404 } | 405 } |
405 | 406 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 chrome_embedded_services + | 497 chrome_embedded_services + |
497 [ ":chrome_content_packaged_services_manifest_for_mash" ] | 498 [ ":chrome_content_packaged_services_manifest_for_mash" ] |
498 } | 499 } |
499 } | 500 } |
500 | 501 |
501 catalog("catalog") { | 502 catalog("catalog") { |
502 embedded_services = chrome_embedded_services + | 503 embedded_services = chrome_embedded_services + |
503 [ ":chrome_content_packaged_services_manifest" ] | 504 [ ":chrome_content_packaged_services_manifest" ] |
504 } | 505 } |
505 } | 506 } |
OLD | NEW |