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

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

Issue 1476643002: mustash: Enable connections to mus from the Chrome renderer [take 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't create a RenderWidgetWindowTreeeClientFactory in tests Created 5 years 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
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_impl.h" 5 #include "content/child/child_thread_impl.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 const IPC::PlatformFileForTransit& file) { 719 const IPC::PlatformFileForTransit& file) {
720 #if defined(MOJO_SHELL_CLIENT) 720 #if defined(MOJO_SHELL_CLIENT)
721 #if defined(OS_POSIX) 721 #if defined(OS_POSIX)
722 base::PlatformFile handle = file.fd; 722 base::PlatformFile handle = file.fd;
723 #elif defined(OS_WIN) 723 #elif defined(OS_WIN)
724 base::PlatformFile handle = file; 724 base::PlatformFile handle = file;
725 #endif 725 #endif
726 mojo::ScopedMessagePipeHandle message_pipe = 726 mojo::ScopedMessagePipeHandle message_pipe =
727 mojo_shell_channel_init_.Init(handle, GetIOTaskRunner()); 727 mojo_shell_channel_init_.Init(handle, GetIOTaskRunner());
728 DCHECK(message_pipe.is_valid()); 728 DCHECK(message_pipe.is_valid());
729 MojoShellConnectionImpl::CreateWithMessagePipe(message_pipe.Pass()); 729 MojoShellConnectionImpl::Get()->BindToMessagePipe(message_pipe.Pass());
730 #endif // defined(MOJO_SHELL_CLIENT) 730 #endif // defined(MOJO_SHELL_CLIENT)
731 } 731 }
732 732
733 #if defined(USE_TCMALLOC) 733 #if defined(USE_TCMALLOC)
734 void ChildThreadImpl::OnGetTcmallocStats() { 734 void ChildThreadImpl::OnGetTcmallocStats() {
735 std::string result; 735 std::string result;
736 char buffer[1024 * 32]; 736 char buffer[1024 * 32];
737 base::allocator::GetStats(buffer, sizeof(buffer)); 737 base::allocator::GetStats(buffer, sizeof(buffer));
738 result.append(buffer); 738 result.append(buffer);
739 Send(new ChildProcessHostMsg_TcmallocStats(result)); 739 Send(new ChildProcessHostMsg_TcmallocStats(result));
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 void ChildThreadImpl::EnsureConnected() { 772 void ChildThreadImpl::EnsureConnected() {
773 VLOG(0) << "ChildThreadImpl::EnsureConnected()"; 773 VLOG(0) << "ChildThreadImpl::EnsureConnected()";
774 base::Process::Current().Terminate(0, false); 774 base::Process::Current().Terminate(0, false);
775 } 775 }
776 776
777 bool ChildThreadImpl::IsInBrowserProcess() const { 777 bool ChildThreadImpl::IsInBrowserProcess() const {
778 return browser_process_io_runner_; 778 return browser_process_io_runner_;
779 } 779 }
780 780
781 } // namespace content 781 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698