| 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/service_manager/public/service_manifest.gni") | 9 import("//services/service_manager/public/service_manifest.gni") |
| 10 import("//tools/grit/grit_rule.gni") | 10 import("//tools/grit/grit_rule.gni") |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 if (enable_plugins && enable_nacl) { | 348 if (enable_plugins && enable_nacl) { |
| 349 deps += [ | 349 deps += [ |
| 350 "//components/nacl/browser", | 350 "//components/nacl/browser", |
| 351 "//components/nacl/renderer/plugin:nacl_trusted_plugin", | 351 "//components/nacl/renderer/plugin:nacl_trusted_plugin", |
| 352 ] | 352 ] |
| 353 } | 353 } |
| 354 } | 354 } |
| 355 | 355 |
| 356 service_manifest_overlay("chrome_content_browser_manifest_overlay") { | 356 service_manifest_overlay("chrome_content_browser_manifest_overlay") { |
| 357 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" | 357 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" |
| 358 packaged_services = [ "image_decoder" ] | 358 packaged_services = [ |
| 359 "image_decoder", |
| 360 "preferences", |
| 361 ] |
| 359 deps = [ | 362 deps = [ |
| 363 "//chrome/browser:preferences_manifest", |
| 360 "//services/image_decoder:manifest", | 364 "//services/image_decoder:manifest", |
| 361 ] | 365 ] |
| 362 } | 366 } |
| 363 | 367 |
| 364 if (use_aura) { | 368 if (use_aura) { |
| 365 # NOTE: These rules generate compiled versions of the content service | 369 # NOTE: These rules generate compiled versions of the content service |
| 366 # manifests with Chrome's overlays applied. These are only used at run-time, | 370 # manifests with Chrome's overlays applied. These are only used at run-time, |
| 367 # and only when running Chrome inside the Mash environment. In production | 371 # and only when running Chrome inside the Mash environment. In production |
| 368 # Chrome, the content manifests and Chrome's overlays are baked into browser | 372 # Chrome, the content manifests and Chrome's overlays are baked into browser |
| 369 # resources and merged at runtime. | 373 # resources and merged at runtime. |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 group("service_manifests") { | 430 group("service_manifests") { |
| 427 data_deps = [ | 431 data_deps = [ |
| 428 ":chrome_content_browser_manifest", | 432 ":chrome_content_browser_manifest", |
| 429 ":chrome_content_gpu_manifest", | 433 ":chrome_content_gpu_manifest", |
| 430 ":chrome_content_plugin_manifest", | 434 ":chrome_content_plugin_manifest", |
| 431 ":chrome_content_renderer_manifest", | 435 ":chrome_content_renderer_manifest", |
| 432 ":chrome_content_utility_manifest", | 436 ":chrome_content_utility_manifest", |
| 433 ] | 437 ] |
| 434 } | 438 } |
| 435 } | 439 } |
| OLD | NEW |