| OLD | NEW |
| 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 "chrome/browser/service_process/service_process_control.h" | 5 #include "chrome/browser/service_process/service_process_control.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 | 34 |
| 35 void ServiceProcessControl::ConnectInternal() { | 35 void ServiceProcessControl::ConnectInternal() { |
| 36 // If the channel has already been established then we run the task | 36 // If the channel has already been established then we run the task |
| 37 // and return. | 37 // and return. |
| 38 if (channel_.get()) { | 38 if (channel_.get()) { |
| 39 RunConnectDoneTasks(); | 39 RunConnectDoneTasks(); |
| 40 return; | 40 return; |
| 41 } | 41 } |
| 42 | 42 |
| 43 // Actually going to connect. | 43 // Actually going to connect. |
| 44 VLOG(1) << "Connecting to Service Process IPC Server"; | 44 DVLOG(1) << "Connecting to Service Process IPC Server"; |
| 45 | 45 |
| 46 // TODO(hclam): Handle error connecting to channel. | 46 // TODO(hclam): Handle error connecting to channel. |
| 47 const IPC::ChannelHandle channel_id = GetServiceProcessChannel(); | 47 const IPC::ChannelHandle channel_id = GetServiceProcessChannel(); |
| 48 SetChannel(IPC::ChannelProxy::Create( | 48 SetChannel(IPC::ChannelProxy::Create( |
| 49 channel_id, | 49 channel_id, |
| 50 IPC::Channel::MODE_NAMED_CLIENT, | 50 IPC::Channel::MODE_NAMED_CLIENT, |
| 51 this, | 51 this, |
| 52 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get())); | 52 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get())); |
| 53 } | 53 } |
| 54 | 54 |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 if (base::LaunchProcess(*cmd_line_, options, &process_handle_)) { | 390 if (base::LaunchProcess(*cmd_line_, options, &process_handle_)) { |
| 391 BrowserThread::PostTask( | 391 BrowserThread::PostTask( |
| 392 BrowserThread::IO, FROM_HERE, | 392 BrowserThread::IO, FROM_HERE, |
| 393 base::Bind(&Launcher::DoDetectLaunched, this)); | 393 base::Bind(&Launcher::DoDetectLaunched, this)); |
| 394 } else { | 394 } else { |
| 395 BrowserThread::PostTask( | 395 BrowserThread::PostTask( |
| 396 BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this)); | 396 BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this)); |
| 397 } | 397 } |
| 398 } | 398 } |
| 399 #endif // !OS_MACOSX | 399 #endif // !OS_MACOSX |
| OLD | NEW |