OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/service_process_control.h" | 5 #include "chrome/browser/service/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/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/process_util.h" | 11 #include "base/process_util.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
13 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
14 #include "base/threading/thread_restrictions.h" | 14 #include "base/threading/thread_restrictions.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/upgrade_detector.h" | 16 #include "chrome/browser/upgrade_detector.h" |
17 #include "chrome/common/chrome_notification_types.h" | 17 #include "chrome/common/chrome_notification_types.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/service_messages.h" | 19 #include "chrome/common/service_messages.h" |
20 #include "chrome/common/service_process_util.h" | 20 #include "chrome/common/service_process_util.h" |
21 #include "content/common/child_process_host.h" | 21 #include "content/common/child_process_host.h" |
22 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
23 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
24 #include "ui/base/ui_base_switches.h" | 24 #include "ui/base/ui_base_switches.h" |
25 | 25 |
| 26 using content::BrowserThread; |
| 27 |
26 // ServiceProcessControl implementation. | 28 // ServiceProcessControl implementation. |
27 ServiceProcessControl::ServiceProcessControl() { | 29 ServiceProcessControl::ServiceProcessControl() { |
28 } | 30 } |
29 | 31 |
30 ServiceProcessControl::~ServiceProcessControl() { | 32 ServiceProcessControl::~ServiceProcessControl() { |
31 } | 33 } |
32 | 34 |
33 void ServiceProcessControl::ConnectInternal() { | 35 void ServiceProcessControl::ConnectInternal() { |
34 // 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 |
35 // and return. | 37 // and return. |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 if (base::LaunchProcess(*cmd_line_, options, NULL)) { | 309 if (base::LaunchProcess(*cmd_line_, options, NULL)) { |
308 BrowserThread::PostTask( | 310 BrowserThread::PostTask( |
309 BrowserThread::IO, FROM_HERE, | 311 BrowserThread::IO, FROM_HERE, |
310 base::Bind(&Launcher::DoDetectLaunched, this)); | 312 base::Bind(&Launcher::DoDetectLaunched, this)); |
311 } else { | 313 } else { |
312 BrowserThread::PostTask( | 314 BrowserThread::PostTask( |
313 BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this)); | 315 BrowserThread::UI, FROM_HERE, base::Bind(&Launcher::Notify, this)); |
314 } | 316 } |
315 } | 317 } |
316 #endif // !OS_MACOSX | 318 #endif // !OS_MACOSX |
OLD | NEW |