| 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
|
|
|
|
|