Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: chrome/app/BUILD.gn

Issue 2772673002: mash: switch to the new pref service (Closed)
Patch Set: Address review comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 = [
367 ":chrome_manifest", 367 ":chrome_manifest",
368 "//chrome/browser:preferences_manifest", 368 "//chrome/browser:preferences_manifest",
369 ] 369 ]
370 370
371 if (is_chromeos) {
372 chrome_packaged_services +=
373 [ "//chrome/browser:preferences_forwarder_manifest" ]
374 }
375
371 service_manifest("chrome_manifest") { 376 service_manifest("chrome_manifest") {
372 source = "chrome_manifest.json" 377 source = "chrome_manifest.json"
373 } 378 }
374 379
375 service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") { 380 service_manifest("chrome_content_packaged_services_manifest_overlay_for_mash") {
376 source = 381 source =
377 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" 382 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
378 packaged_services = chrome_packaged_services 383 packaged_services = chrome_packaged_services
379 } 384 }
380 385
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 chrome_embedded_services + 501 chrome_embedded_services +
497 [ ":chrome_content_packaged_services_manifest_for_mash" ] 502 [ ":chrome_content_packaged_services_manifest_for_mash" ]
498 } 503 }
499 } 504 }
500 505
501 catalog("catalog") { 506 catalog("catalog") {
502 embedded_services = chrome_embedded_services + 507 embedded_services = chrome_embedded_services +
503 [ ":chrome_content_packaged_services_manifest" ] 508 [ ":chrome_content_packaged_services_manifest" ]
504 } 509 }
505 } 510 }
OLDNEW
« no previous file with comments | « ash/shell.cc ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698