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

Unified Diff: services/catalog/reader.cc

Issue 2221153003: Establish MojoChildConnection from BrowserChildProcessHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@renderer-channel
Patch Set: rebase Created 4 years, 4 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 | « services/catalog/entry.cc ('k') | services/shell/service_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/reader.cc
diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc
index 7439f30876bb4702afb76312dedb776047ccb831..afa5272b5630462f005b301e8930831b88a825f0 100644
--- a/services/catalog/reader.cc
+++ b/services/catalog/reader.cc
@@ -133,8 +133,9 @@ std::unique_ptr<Entry> ReadManifest(const base::FilePath& package_dir,
}
void AddEntryToCache(EntryCache* cache, std::unique_ptr<Entry> entry) {
- for (auto* child : entry->services())
- AddEntryToCache(cache, base::WrapUnique(child));
+ std::vector<std::unique_ptr<Entry>> children = entry->TakeChildren();
+ for (auto& child : children)
+ AddEntryToCache(cache, std::move(child));
(*cache)[entry->name()] = std::move(entry);
}
« no previous file with comments | « services/catalog/entry.cc ('k') | services/shell/service_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698