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

Side by Side Diff: content/child/child_thread.cc

Issue 304273004: Add name to services (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get chrome to build 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/child/child_thread.h ('k') | content/renderer/render_thread_impl.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 #include "content/child/child_thread.h" 5 #include "content/child/child_thread.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 void ChildThread::OnChannelConnected(int32 peer_pid) { 347 void ChildThread::OnChannelConnected(int32 peer_pid) {
348 channel_connected_factory_.InvalidateWeakPtrs(); 348 channel_connected_factory_.InvalidateWeakPtrs();
349 } 349 }
350 350
351 void ChildThread::OnChannelError() { 351 void ChildThread::OnChannelError() {
352 set_on_channel_error_called(true); 352 set_on_channel_error_called(true);
353 base::MessageLoop::current()->Quit(); 353 base::MessageLoop::current()->Quit();
354 } 354 }
355 355
356 void ChildThread::ConnectToService( 356 void ChildThread::ConnectToService(
357 const mojo::String& service_name, 357 const mojo::String& url,
358 const mojo::String& name,
358 mojo::ScopedMessagePipeHandle message_pipe) { 359 mojo::ScopedMessagePipeHandle message_pipe) {
359 // By default, we don't expect incoming connections. 360 // By default, we don't expect incoming connections.
360 NOTREACHED(); 361 NOTREACHED();
361 } 362 }
362 363
363 bool ChildThread::Send(IPC::Message* msg) { 364 bool ChildThread::Send(IPC::Message* msg) {
364 DCHECK(base::MessageLoop::current() == message_loop()); 365 DCHECK(base::MessageLoop::current() == message_loop());
365 if (!channel_) { 366 if (!channel_) {
366 delete msg; 367 delete msg;
367 return false; 368 return false;
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 // inflight that would addref it. 543 // inflight that would addref it.
543 Send(new ChildProcessHostMsg_ShutdownRequest); 544 Send(new ChildProcessHostMsg_ShutdownRequest);
544 } 545 }
545 546
546 void ChildThread::EnsureConnected() { 547 void ChildThread::EnsureConnected() {
547 VLOG(0) << "ChildThread::EnsureConnected()"; 548 VLOG(0) << "ChildThread::EnsureConnected()";
548 base::KillProcess(base::GetCurrentProcessHandle(), 0, false); 549 base::KillProcess(base::GetCurrentProcessHandle(), 0, false);
549 } 550 }
550 551
551 } // namespace content 552 } // namespace content
OLDNEW
« no previous file with comments | « content/child/child_thread.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698