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

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

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Removing debug include. Created 3 years, 5 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 | « no previous file | chrome/app/mash/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 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 source = 401 source =
402 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" 402 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
403 packaged_services = chrome_packaged_services 403 packaged_services = chrome_packaged_services
404 } 404 }
405 405
406 service_manifest("chrome_content_packaged_services_manifest_overlay") { 406 service_manifest("chrome_content_packaged_services_manifest_overlay") {
407 source = 407 source =
408 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json" 408 "//chrome/browser/chrome_content_packaged_services_manifest_overlay.json"
409 packaged_services = chrome_packaged_services 409 packaged_services = chrome_packaged_services
410 if (is_chromeos) { 410 if (is_chromeos) {
411 packaged_services += [ "//ash/mus:manifest" ] 411 packaged_services += [
412 "//ash/mus:manifest",
413 "//services/ui:manifest",
414 ]
412 } 415 }
413 } 416 }
414 417
415 service_manifest("chrome_content_browser_manifest_overlay") { 418 service_manifest("chrome_content_browser_manifest_overlay") {
416 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json" 419 source = "//chrome/browser/chrome_content_browser_manifest_overlay.json"
417 packaged_services = [ 420 packaged_services = [
418 "//services/identity:manifest", 421 "//services/identity:manifest",
419 "//services/preferences:manifest", 422 "//services/preferences:manifest",
420 ] 423 ]
421 } 424 }
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 } 539 }
537 540
538 catalog("catalog_for_tests_mash") { 541 catalog("catalog_for_tests_mash") {
539 embedded_services = chrome_embedded_services + [ 542 embedded_services = chrome_embedded_services + [
540 ":chrome_content_packaged_services_manifest_for_mash", 543 ":chrome_content_packaged_services_manifest_for_mash",
541 ":chrome_test_browser_manifest", 544 ":chrome_test_browser_manifest",
542 ] 545 ]
543 embedded_services -= [ ":chrome_content_browser_manifest" ] 546 embedded_services -= [ ":chrome_content_browser_manifest" ]
544 } 547 }
545 } 548 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698