diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 22:39:58 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-25 22:39:58 +0000 |
| commit | 33d753aa54180352dc3cadd9322074f9f6f4a438 (patch) | |
| tree | 6ee8499093cf70a5c2061ca79105dad2eb232367 /chrome/browser/service | |
| parent | 42a53a7982ca052c19c35562efc36e8b081f414b (diff) | |
| download | chromium_src-33d753aa54180352dc3cadd9322074f9f6f4a438.zip chromium_src-33d753aa54180352dc3cadd9322074f9f6f4a438.tar.gz chromium_src-33d753aa54180352dc3cadd9322074f9f6f4a438.tar.bz2 | |
Mac proxy auto-launch.
Delta from http://codereview.chromium.org/6482016 that adds in auto-launching of the proxy on the Macintosh and turns on the proxy management UI in Under the Hood.
BUG=none
TEST=Bring up the UI, enable CP, log out and log in, check to see that the proxy is running.
Review URL: http://codereview.chromium.org/6499019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/service')
| -rw-r--r-- | chrome/browser/service/service_process_control.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/service/service_process_control_mac.mm | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc index eb7a983..1014db1 100644 --- a/chrome/browser/service/service_process_control.cc +++ b/chrome/browser/service/service_process_control.cc @@ -324,9 +324,13 @@ void ServiceProcessControl::Launcher::DoDetectLaunched() { void ServiceProcessControl::Launcher::DoRun() { DCHECK(notify_task_.get()); - base::LaunchApp(*cmd_line_.get(), false, true, NULL); - BrowserThread::PostTask( - BrowserThread::IO, FROM_HERE, - NewRunnableMethod(this, &Launcher::DoDetectLaunched)); + if (base::LaunchApp(*cmd_line_, false, true, NULL)) { + BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, + NewRunnableMethod(this, + &Launcher::DoDetectLaunched)); + } else { + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, + NewRunnableMethod(this, &Launcher::Notify)); + } } #endif // !OS_MACOSX diff --git a/chrome/browser/service/service_process_control_mac.mm b/chrome/browser/service/service_process_control_mac.mm index ebb2f2d..e398b90 100644 --- a/chrome/browser/service/service_process_control_mac.mm +++ b/chrome/browser/service/service_process_control_mac.mm @@ -12,7 +12,7 @@ void ServiceProcessControl::Launcher::DoRun() { base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_plist( - CreateServiceProcessLaunchdPlist(cmd_line_.get())); + CreateServiceProcessLaunchdPlist(cmd_line_.get(), false)); CFErrorRef error = NULL; if (!GTMSMJobSubmit(launchd_plist, &error)) { LOG(ERROR) << error; |