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

Unified Diff: trunk/src/content/browser/mojo/mojo_application_host.cc

Issue 352013002: Revert 279557 "Support exposing Mojo services between render fra..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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
Index: trunk/src/content/browser/mojo/mojo_application_host.cc
===================================================================
--- trunk/src/content/browser/mojo/mojo_application_host.cc (revision 279559)
+++ trunk/src/content/browser/mojo/mojo_application_host.cc (working copy)
@@ -30,7 +30,7 @@
}
bool MojoApplicationHost::Init() {
- DCHECK(!client_handle_.is_valid()) << "Already initialized!";
+ DCHECK(!child_service_provider_.get()) << "Already initialized!";
mojo::embedder::PlatformChannelPair channel_pair;
@@ -43,7 +43,8 @@
// Forward this to the client once we know its process handle.
client_handle_ = channel_pair.PassClientHandle();
- service_registry_.BindRemoteServiceProvider(message_pipe.Pass());
+ child_service_provider_.reset(
+ BindToPipe(new ServiceProviderImpl(), message_pipe.Pass()));
return true;
}
@@ -59,4 +60,12 @@
return did_activate_;
}
+void MojoApplicationHost::ServiceProviderImpl::ConnectToService(
+ const mojo::String& service_url,
+ const mojo::String& service_name,
+ mojo::ScopedMessagePipeHandle handle,
+ const mojo::String& requestor_url) {
+ // TODO(darin): Provide something meaningful here.
+}
+
} // namespace content
Property changes on: trunk/src/content/browser/mojo/mojo_application_host.cc
___________________________________________________________________
Deleted: svn:eol-style
- LF

Powered by Google App Engine
This is Rietveld 408576698