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

Unified Diff: services/catalog/entry.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.h ('k') | services/catalog/reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/entry.cc
diff --git a/services/catalog/entry.cc b/services/catalog/entry.cc
index 6d8acdde5ac9ba1a85e126b5eb553c21986d5545..4cca6c3c2a76fe2649ffeef3fb24f42d48f6ad46 100644
--- a/services/catalog/entry.cc
+++ b/services/catalog/entry.cc
@@ -123,7 +123,6 @@ bool BuildCapabilities(const base::DictionaryValue& value,
Entry::Entry() {}
Entry::Entry(const std::string& name)
: name_(name), qualifier_(shell::GetNamePath(name)), display_name_(name) {}
-Entry::Entry(const Entry& other) = default;
Entry::~Entry() {}
std::unique_ptr<base::DictionaryValue> Entry::Serialize() const {
@@ -241,7 +240,7 @@ std::unique_ptr<Entry> Entry::Deserialize(const base::DictionaryValue& value) {
if (child) {
child->set_package(entry.get());
// Caller must assume ownership of these items.
- entry->services_.insert(child.release());
+ entry->children_.emplace_back(std::move(child));
}
}
}
« no previous file with comments | « services/catalog/entry.h ('k') | services/catalog/reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698