| 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 361   if (enable_plugins && enable_nacl) { | 361   if (enable_plugins && enable_nacl) { | 
| 362     deps += [ | 362     deps += [ | 
| 363       "//components/nacl/browser", | 363       "//components/nacl/browser", | 
| 364       "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 364       "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 
| 365     ] | 365     ] | 
| 366   } | 366   } | 
| 367 | 367 | 
| 368   if (enable_package_mash_services) { | 368   if (enable_package_mash_services) { | 
| 369     deps += [ | 369     deps += [ | 
| 370       "//chrome/app/mash:chrome_mash_catalog", | 370       "//chrome/app/mash:chrome_mash_catalog", | 
|  | 371       "//chrome/app/mash:chrome_test_catalog", | 
| 371       "//chrome/app/mash:embedded_services", | 372       "//chrome/app/mash:embedded_services", | 
| 372       "//mash/common", | 373       "//mash/common", | 
| 373       "//mash/quick_launch/public/interfaces:constants", | 374       "//mash/quick_launch/public/interfaces:constants", | 
| 374       "//services/ui/public/interfaces:constants", | 375       "//services/ui/public/interfaces:constants", | 
| 375     ] | 376     ] | 
| 376 | 377 | 
| 377     if (is_chromeos) { | 378     if (is_chromeos) { | 
| 378       deps += [ "//chrome/app/mash:chrome_mus_catalog" ] | 379       deps += [ "//chrome/app/mash:chrome_mus_catalog" ] | 
| 379     } | 380     } | 
| 380   } | 381   } | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 412 } | 413 } | 
| 413 | 414 | 
| 414 service_manifest("chrome_content_browser_manifest_overlay") { | 415 service_manifest("chrome_content_browser_manifest_overlay") { | 
| 415   source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 416   source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 
| 416   packaged_services = [ | 417   packaged_services = [ | 
| 417     "//services/identity:manifest", | 418     "//services/identity:manifest", | 
| 418     "//services/preferences:manifest", | 419     "//services/preferences:manifest", | 
| 419   ] | 420   ] | 
| 420 } | 421 } | 
| 421 | 422 | 
|  | 423 service_manifest("chrome_test_browser_overlay") { | 
|  | 424   source = "//chrome/browser/chrome_test_browser_overlay.json" | 
|  | 425 } | 
|  | 426 | 
| 422 service_manifest("chrome_content_gpu_manifest_overlay") { | 427 service_manifest("chrome_content_gpu_manifest_overlay") { | 
| 423   source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" | 428   source = "//chrome/browser/chrome_content_gpu_manifest_overlay.json" | 
| 424 } | 429 } | 
| 425 | 430 | 
| 426 service_manifest("chrome_content_plugin_manifest_overlay") { | 431 service_manifest("chrome_content_plugin_manifest_overlay") { | 
| 427   source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" | 432   source = "//chrome/browser/chrome_content_plugin_manifest_overlay.json" | 
| 428 } | 433 } | 
| 429 | 434 | 
| 430 service_manifest("chrome_content_renderer_manifest_overlay") { | 435 service_manifest("chrome_content_renderer_manifest_overlay") { | 
| 431   source = "//chrome/browser/chrome_content_renderer_manifest_overlay.json" | 436   source = "//chrome/browser/chrome_content_renderer_manifest_overlay.json" | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 465   service_manifest("chrome_content_packaged_services_manifest_for_mash") { | 470   service_manifest("chrome_content_packaged_services_manifest_for_mash") { | 
| 466     source_manifest = "//content/public/app:packaged_services_manifest" | 471     source_manifest = "//content/public/app:packaged_services_manifest" | 
| 467     overlays = [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ] | 472     overlays = [ ":chrome_content_packaged_services_manifest_overlay_for_mash" ] | 
| 468   } | 473   } | 
| 469 | 474 | 
| 470   service_manifest("chrome_content_browser_manifest") { | 475   service_manifest("chrome_content_browser_manifest") { | 
| 471     source_manifest = "//content/public/app:browser_manifest" | 476     source_manifest = "//content/public/app:browser_manifest" | 
| 472     overlays = [ ":chrome_content_browser_manifest_overlay" ] | 477     overlays = [ ":chrome_content_browser_manifest_overlay" ] | 
| 473   } | 478   } | 
| 474 | 479 | 
|  | 480   service_manifest("chrome_test_browser_manifest") { | 
|  | 481     source_manifest = ":chrome_content_browser_manifest" | 
|  | 482     overlays = [ ":chrome_test_browser_overlay" ] | 
|  | 483   } | 
|  | 484 | 
| 475   service_manifest("chrome_content_gpu_manifest") { | 485   service_manifest("chrome_content_gpu_manifest") { | 
| 476     source_manifest = "//content/public/app:gpu_manifest" | 486     source_manifest = "//content/public/app:gpu_manifest" | 
| 477     overlays = [ ":chrome_content_gpu_manifest_overlay" ] | 487     overlays = [ ":chrome_content_gpu_manifest_overlay" ] | 
| 478   } | 488   } | 
| 479 | 489 | 
| 480   service_manifest("chrome_content_plugin_manifest") { | 490   service_manifest("chrome_content_plugin_manifest") { | 
| 481     source_manifest = "//content/public/app:plugin_manifest" | 491     source_manifest = "//content/public/app:plugin_manifest" | 
| 482     overlays = [ ":chrome_content_plugin_manifest_overlay" ] | 492     overlays = [ ":chrome_content_plugin_manifest_overlay" ] | 
| 483   } | 493   } | 
| 484 | 494 | 
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 517   catalog("catalog") { | 527   catalog("catalog") { | 
| 518     embedded_services = chrome_embedded_services + | 528     embedded_services = chrome_embedded_services + | 
| 519                         [ ":chrome_content_packaged_services_manifest" ] | 529                         [ ":chrome_content_packaged_services_manifest" ] | 
| 520   } | 530   } | 
| 521 | 531 | 
| 522   catalog("catalog_for_mash") { | 532   catalog("catalog_for_mash") { | 
| 523     embedded_services = | 533     embedded_services = | 
| 524         chrome_embedded_services + | 534         chrome_embedded_services + | 
| 525         [ ":chrome_content_packaged_services_manifest_for_mash" ] | 535         [ ":chrome_content_packaged_services_manifest_for_mash" ] | 
| 526   } | 536   } | 
|  | 537 | 
|  | 538   catalog("catalog_for_tests_mash") { | 
|  | 539     embedded_services = chrome_embedded_services + [ | 
|  | 540                           ":chrome_content_packaged_services_manifest_for_mash", | 
|  | 541                           ":chrome_test_browser_manifest", | 
|  | 542                         ] | 
|  | 543     embedded_services -= [ ":chrome_content_browser_manifest" ] | 
|  | 544   } | 
| 527 } | 545 } | 
| OLD | NEW | 
|---|