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

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

Issue 298003008: Shell / ShellClient -> ServiceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/mojo/mojo_application_host.cc ('k') | content/child/child_thread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2056 matching lines...) Expand 10 before | Expand all | Expand 10 after
2067 Cleanup(); 2067 Cleanup();
2068 } 2068 }
2069 2069
2070 void RenderProcessHostImpl::ConnectTo( 2070 void RenderProcessHostImpl::ConnectTo(
2071 const base::StringPiece& service_name, 2071 const base::StringPiece& service_name,
2072 mojo::ScopedMessagePipeHandle handle) { 2072 mojo::ScopedMessagePipeHandle handle) {
2073 mojo_activation_required_ = true; 2073 mojo_activation_required_ = true;
2074 MaybeActivateMojo(); 2074 MaybeActivateMojo();
2075 2075
2076 mojo::AllocationScope scope; 2076 mojo::AllocationScope scope;
2077 mojo_application_host_->shell_client()->AcceptConnection(service_name, 2077 mojo_application_host_->service_provider()->ConnectToService(service_name,
2078 handle.Pass()); 2078 handle.Pass());
2079 } 2079 }
2080 2080
2081 } // namespace content 2081 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/mojo/mojo_application_host.cc ('k') | content/child/child_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698