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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/process_util.h" | 9 #include "base/process_util.h" |
10 #include "base/stl_util-inl.h" | 10 #include "base/stl_util-inl.h" |
11 #include "base/threading/thread.h" | 11 #include "base/threading/thread.h" |
12 #include "base/threading/thread_restrictions.h" | 12 #include "base/threading/thread_restrictions.h" |
13 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/io_thread.h" | 14 #include "chrome/browser/io_thread.h" |
15 #include "chrome/browser/upgrade_detector.h" | 15 #include "chrome/browser/upgrade_detector.h" |
16 #include "chrome/common/child_process_host.h" | |
17 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
18 #include "chrome/common/service_messages.h" | 17 #include "chrome/common/service_messages.h" |
19 #include "chrome/common/service_process_util.h" | 18 #include "chrome/common/service_process_util.h" |
20 #include "content/browser/browser_thread.h" | 19 #include "content/browser/browser_thread.h" |
| 20 #include "content/common/child_process_host.h" |
21 #include "content/common/notification_service.h" | 21 #include "content/common/notification_service.h" |
22 #include "ui/base/ui_base_switches.h" | 22 #include "ui/base/ui_base_switches.h" |
23 | 23 |
24 | 24 |
25 // ServiceProcessControl implementation. | 25 // ServiceProcessControl implementation. |
26 ServiceProcessControl::ServiceProcessControl(Profile* profile) | 26 ServiceProcessControl::ServiceProcessControl(Profile* profile) |
27 : profile_(profile) { | 27 : profile_(profile) { |
28 } | 28 } |
29 | 29 |
30 ServiceProcessControl::~ServiceProcessControl() { | 30 ServiceProcessControl::~ServiceProcessControl() { |
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 if (base::LaunchApp(*cmd_line_, false, true, NULL)) { | 354 if (base::LaunchApp(*cmd_line_, false, true, NULL)) { |
355 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 355 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
356 NewRunnableMethod(this, | 356 NewRunnableMethod(this, |
357 &Launcher::DoDetectLaunched)); | 357 &Launcher::DoDetectLaunched)); |
358 } else { | 358 } else { |
359 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 359 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
360 NewRunnableMethod(this, &Launcher::Notify)); | 360 NewRunnableMethod(this, &Launcher::Notify)); |
361 } | 361 } |
362 } | 362 } |
363 #endif // !OS_MACOSX | 363 #endif // !OS_MACOSX |
OLD | NEW |