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

Unified Diff: services/catalog/entry.h

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 | « content/public/test/test_utils.cc ('k') | services/catalog/entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/entry.h
diff --git a/services/catalog/entry.h b/services/catalog/entry.h
index 8067b853865eeba9f39f190abed3d76f3e092cfd..93d4a914a7c2d906ec33793c02ac98d4c034b0b0 100644
--- a/services/catalog/entry.h
+++ b/services/catalog/entry.h
@@ -6,8 +6,8 @@
#define SERVICES_CATALOG_ENTRY_H_
#include <memory>
-#include <set>
#include <string>
+#include <vector>
#include "base/files/file_path.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
@@ -25,7 +25,6 @@ class Entry {
public:
Entry();
explicit Entry(const std::string& name);
- explicit Entry(const Entry& other);
~Entry();
std::unique_ptr<base::DictionaryValue> Serialize() const;
@@ -56,7 +55,10 @@ class Entry {
}
const Entry* package() const { return package_; }
void set_package(Entry* package) { package_ = package; }
- const std::set<Entry*>& services() { return services_; }
+
+ std::vector<std::unique_ptr<Entry>> TakeChildren() {
+ return std::move(children_);
+ }
private:
std::string name_;
@@ -65,7 +67,7 @@ class Entry {
std::string display_name_;
shell::CapabilitySpec capabilities_;
Entry* package_ = nullptr;
- std::set<Entry*> services_;
+ std::vector<std::unique_ptr<Entry>> children_;
};
} // namespace catalog
« no previous file with comments | « content/public/test/test_utils.cc ('k') | services/catalog/entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698