| 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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 } | 356 } |
| 357 | 357 |
| 358 if (enable_plugins && enable_nacl) { | 358 if (enable_plugins && enable_nacl) { |
| 359 deps += [ | 359 deps += [ |
| 360 "//components/nacl/browser", | 360 "//components/nacl/browser", |
| 361 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 361 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 362 ] | 362 ] |
| 363 } | 363 } |
| 364 } | 364 } |
| 365 | 365 |
| 366 chrome_packaged_services = [ | 366 chrome_packaged_services = [ ":chrome_manifest" ] |
| 367 ":chrome_manifest", | |
| 368 "//chrome/browser:preferences_manifest", | |
| 369 ] | |
| 370 | 367 |
| 371 if (is_chromeos) { | 368 if (is_chromeos) { |
| 372 chrome_packaged_services += | 369 chrome_packaged_services += |
| 373 [ "//chrome/browser:preferences_forwarder_manifest" ] | 370 [ "//chrome/browser:preferences_forwarder_manifest" ] |
| 374 } | 371 } |
| 375 | 372 |
| 376 service_manifest("chrome_manifest") { | 373 service_manifest("chrome_manifest") { |
| 377 source = "chrome_manifest.json" | 374 source = "chrome_manifest.json" |
| 378 } | 375 } |
| 379 | 376 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 chrome_embedded_services + | 498 chrome_embedded_services + |
| 502 [ ":chrome_content_packaged_services_manifest_for_mash" ] | 499 [ ":chrome_content_packaged_services_manifest_for_mash" ] |
| 503 } | 500 } |
| 504 } | 501 } |
| 505 | 502 |
| 506 catalog("catalog") { | 503 catalog("catalog") { |
| 507 embedded_services = chrome_embedded_services + | 504 embedded_services = chrome_embedded_services + |
| 508 [ ":chrome_content_packaged_services_manifest" ] | 505 [ ":chrome_content_packaged_services_manifest" ] |
| 509 } | 506 } |
| 510 } | 507 } |
| OLD | NEW |