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

Unified Diff: content/browser/mojo/mojo_child_connection.h

Issue 2183703005: Renderers should obtain browser InterfaceProvider by connecting to browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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/browser/mojo/constants.cc ('k') | content/browser/mojo/mojo_child_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_child_connection.h
diff --git a/content/browser/mojo/mojo_child_connection.h b/content/browser/mojo/mojo_child_connection.h
index 02c3daa3e48c071abacc493b77f8e7ee399db3f7..2a6453053575b64e599da60f85093b4ad7282159 100644
--- a/content/browser/mojo/mojo_child_connection.h
+++ b/content/browser/mojo/mojo_child_connection.h
@@ -13,6 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "base/process/process_handle.h"
#include "base/sequenced_task_runner.h"
+#include "services/shell/public/cpp/identity.h"
#include "services/shell/public/cpp/interface_provider.h"
#include "services/shell/public/cpp/interface_registry.h"
#include "services/shell/public/interfaces/connector.mojom.h"
@@ -52,6 +53,10 @@ class MojoChildConnection {
return &remote_interfaces_;
}
+ const shell::Identity& child_identity() const {
+ return child_identity_;
+ }
+
// A token which must be passed to the child process via
// |switches::kPrimordialPipeToken| in order for the child to initialize its
// end of the shell connection pipe.
@@ -62,12 +67,6 @@ class MojoChildConnection {
// functional until this is called.
void SetProcessHandle(base::ProcessHandle handle);
-#if defined(OS_ANDROID)
- InterfaceRegistryAndroid* interface_registry_android() {
- return interface_registry_android_.get();
- }
-#endif
-
private:
class IOThreadContext;
@@ -75,7 +74,7 @@ class MojoChildConnection {
mojo::ScopedMessagePipeHandle request_handle);
scoped_refptr<IOThreadContext> context_;
-
+ shell::Identity child_identity_;
const std::string service_token_;
shell::InterfaceRegistry interface_registry_;
« no previous file with comments | « content/browser/mojo/constants.cc ('k') | content/browser/mojo/mojo_child_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698