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

Side by Side Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 298653010: Change Shell / ShellClient to ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Support content Mojo stuff Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Represents the browser side of the browser <--> renderer communication 5 // Represents the browser side of the browser <--> renderer communication
6 // channel. There will be one RenderProcessHost per renderer process. 6 // channel. There will be one RenderProcessHost per renderer process.
7 7
8 #include "content/browser/renderer_host/render_process_host_impl.h" 8 #include "content/browser/renderer_host/render_process_host_impl.h"
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 2058 matching lines...) Expand 10 before | Expand all | Expand 10 after
2069 Cleanup(); 2069 Cleanup();
2070 } 2070 }
2071 2071
2072 void RenderProcessHostImpl::ConnectTo( 2072 void RenderProcessHostImpl::ConnectTo(
2073 const base::StringPiece& service_name, 2073 const base::StringPiece& service_name,
2074 mojo::ScopedMessagePipeHandle handle) { 2074 mojo::ScopedMessagePipeHandle handle) {
2075 mojo_activation_required_ = true; 2075 mojo_activation_required_ = true;
2076 MaybeActivateMojo(); 2076 MaybeActivateMojo();
2077 2077
2078 mojo::AllocationScope scope; 2078 mojo::AllocationScope scope;
2079 mojo_application_host_->shell_client()->AcceptConnection(service_name, 2079 mojo_application_host_->service_provider()->ConnectToService(service_name,
2080 handle.Pass()); 2080 handle.Pass());
2081 } 2081 }
2082 2082
2083 } // namespace content 2083 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698