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

Unified Diff: content/public/browser/content_browser_client.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/gpu/gpu_process_control_impl.cc ('k') | content/public/common/mojo_application_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 29e96421a40d2fc1fccf40c16d36f9032e401eed..298a968259a5bb352b65a9ce81baba52ade76ff5 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -21,6 +21,7 @@
#include "content/public/browser/navigation_throttle.h"
#include "content/public/common/content_client.h"
#include "content/public/common/media_stream_request.h"
+#include "content/public/common/mojo_application_info.h"
#include "content/public/common/resource_type.h"
#include "content/public/common/socket_permission_request.h"
#include "content/public/common/window_container_type.h"
@@ -650,10 +651,7 @@ class CONTENT_EXPORT ContentBrowserClient {
ServiceRegistry* registry,
RenderFrameHost* render_frame_host) {}
- using StaticMojoApplicationMap =
- std::map<std::string,
- base::Callback<std::unique_ptr<shell::ShellClient>(
- const base::Closure& quit_closure)>>;
+ using StaticMojoApplicationMap = std::map<std::string, MojoApplicationInfo>;
// Registers Mojo applications to be loaded in the browser process by the
// browser's global Mojo shell.
« no previous file with comments | « content/gpu/gpu_process_control_impl.cc ('k') | content/public/common/mojo_application_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698