| 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 source = | 383 source = |
| 384 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" | 384 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" |
| 385 packaged_services = chrome_packaged_services | 385 packaged_services = chrome_packaged_services |
| 386 if (is_chromeos) { | 386 if (is_chromeos) { |
| 387 packaged_services += [ "//ash/mus:manifest" ] | 387 packaged_services += [ "//ash/mus:manifest" ] |
| 388 } | 388 } |
| 389 } | 389 } |
| 390 | 390 |
| 391 service_manifest("chrome_content_browser_manifest_overlay") { | 391 service_manifest("chrome_content_browser_manifest_overlay") { |
| 392 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 392 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" |
| 393 packaged_services = [ "//services/preferences:manifest" ] | 393 packaged_services = [ |
| 394 "//services/identity:manifest", |
| 395 "//services/preferences:manifest", |
| 396 ] |
| 394 } | 397 } |
| 395 | 398 |
| 396 service_manifest("chrome_content_gpu_manifest_overlay") { | 399 service_manifest("chrome_content_gpu_manifest_overlay") { |
| 397 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" | 400 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" |
| 398 } | 401 } |
| 399 | 402 |
| 400 service_manifest("chrome_content_plugin_manifest_overlay") { | 403 service_manifest("chrome_content_plugin_manifest_overlay") { |
| 401 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" | 404 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" |
| 402 } | 405 } |
| 403 | 406 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 chrome_embedded_services + | 497 chrome_embedded_services + |
| 495 [ ":chrome_content_packaged_services_manifest_for_mash" ] | 498 [ ":chrome_content_packaged_services_manifest_for_mash" ] |
| 496 } | 499 } |
| 497 } | 500 } |
| 498 | 501 |
| 499 catalog("catalog") { | 502 catalog("catalog") { |
| 500 embedded_services = chrome_embedded_services + | 503 embedded_services = chrome_embedded_services + |
| 501 [ ":chrome_content_packaged_services_manifest" ] | 504 [ ":chrome_content_packaged_services_manifest" ] |
| 502 } | 505 } |
| 503 } | 506 } |
| OLD | NEW |