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

Unified Diff: content/child/process_control_impl.h

Issue 1947313002: Enable content embedders to specify mojo application task runner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores mojo:media in browser Created 4 years, 7 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/browser/mojo/mojo_shell_context.cc ('k') | content/child/process_control_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/process_control_impl.h
diff --git a/content/child/process_control_impl.h b/content/child/process_control_impl.h
index 0ae4ab448a242ac40e0524509d3ed24aad6ee0a8..d8a1938a1d6d1a6f6946ab2cd19634c617f4c2bd 100644
--- a/content/child/process_control_impl.h
+++ b/content/child/process_control_impl.h
@@ -5,28 +5,27 @@
#ifndef CONTENT_CHILD_PROCESS_CONTROL_IMPL_H_
#define CONTENT_CHILD_PROCESS_CONTROL_IMPL_H_
+#include <map>
#include <memory>
-#include <unordered_map>
#include "base/macros.h"
-#include "content/common/mojo/embedded_application_runner.h"
#include "content/common/process_control.mojom.h"
+#include "content/public/common/mojo_application_info.h"
#include "services/shell/public/interfaces/shell_client.mojom.h"
namespace content {
+class EmbeddedApplicationRunner;
+
// Default implementation of the mojom::ProcessControl interface.
class ProcessControlImpl : public mojom::ProcessControl {
public:
- using ApplicationFactoryMap =
- std::unordered_map<std::string,
- EmbeddedApplicationRunner::FactoryCallback>;
+ using ApplicationMap = std::map<std::string, MojoApplicationInfo>;
ProcessControlImpl();
~ProcessControlImpl() override;
- virtual void RegisterApplicationFactories(
- ApplicationFactoryMap* factories) = 0;
+ virtual void RegisterApplications(ApplicationMap* apps) = 0;
virtual void OnApplicationQuit() {}
// ProcessControl:
« no previous file with comments | « content/browser/mojo/mojo_shell_context.cc ('k') | content/child/process_control_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698