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

Unified Diff: mojo/public/tools/manifest/manifest_collator.py

Issue 1871223003: Use ShellClientFactory interface to load mojo:profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/browser/browser_context.h ('k') | services/shell/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/tools/manifest/manifest_collator.py
diff --git a/mojo/public/tools/manifest/manifest_collator.py b/mojo/public/tools/manifest/manifest_collator.py
index fa95e37f21aa7d1c31c054a3925eca7f20bc5cbf..a2a3f2d0466a3a02cdf25f42de78cdbd1d3b9a86 100755
--- a/mojo/public/tools/manifest/manifest_collator.py
+++ b/mojo/public/tools/manifest/manifest_collator.py
@@ -40,6 +40,14 @@ def MergeDicts(left, right):
def MergeBaseManifest(parent, base):
MergeDicts(parent["capabilities"], base["capabilities"])
+ if "applications" in base:
+ if "applications" not in parent:
+ parent["applications"] = []
+ parent["applications"].extend(base["applications"])
+
+ if "process-group" in base:
+ parent["process-group"] = base["process-group"]
+
def main():
parser = argparse.ArgumentParser(
« no previous file with comments | « content/public/browser/browser_context.h ('k') | services/shell/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698