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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 source = | 374 source = |
375 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" | 375 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" |
376 packaged_services = chrome_packaged_services | 376 packaged_services = chrome_packaged_services |
377 if (is_chromeos) { | 377 if (is_chromeos) { |
378 packaged_services += [ "//ash/mus:manifest" ] | 378 packaged_services += [ "//ash/mus:manifest" ] |
379 } | 379 } |
380 } | 380 } |
381 | 381 |
382 service_manifest("chrome_content_browser_manifest_overlay") { | 382 service_manifest("chrome_content_browser_manifest_overlay") { |
383 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 383 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" |
| 384 packaged_services = [ "//chrome/browser:preferences2_manifest" ] |
384 } | 385 } |
385 | 386 |
386 service_manifest("chrome_content_gpu_manifest_overlay") { | 387 service_manifest("chrome_content_gpu_manifest_overlay") { |
387 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" | 388 source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" |
388 } | 389 } |
389 | 390 |
390 service_manifest("chrome_content_plugin_manifest_overlay") { | 391 service_manifest("chrome_content_plugin_manifest_overlay") { |
391 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" | 392 source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" |
392 } | 393 } |
393 | 394 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 chrome_embedded_services + | 485 chrome_embedded_services + |
485 [ ":chrome_content_packaged_services_manifest_for_mash" ] | 486 [ ":chrome_content_packaged_services_manifest_for_mash" ] |
486 } | 487 } |
487 } | 488 } |
488 | 489 |
489 catalog("catalog") { | 490 catalog("catalog") { |
490 embedded_services = chrome_embedded_services + | 491 embedded_services = chrome_embedded_services + |
491 [ ":chrome_content_packaged_services_manifest" ] | 492 [ ":chrome_content_packaged_services_manifest" ] |
492 } | 493 } |
493 } | 494 } |
OLD | NEW |