diff options
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/service_process_util_mac.mm | 5 | ||||
-rw-r--r-- | chrome/common/service_process_util_posix.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm index 62a0371..d06a93e 100644 --- a/chrome/common/service_process_util_mac.mm +++ b/chrome/common/service_process_util_mac.mm @@ -179,6 +179,7 @@ bool ServiceProcessState::Initialize() { return false; } state_->launchd_conf_.reset(dict); + state_->ui_message_loop_= base::MessageLoopProxy::CreateForCurrentThread(); return true; } @@ -322,7 +323,9 @@ bool ServiceProcessState::StateData::WatchExecutable() { LOG(ERROR) << "executable_watcher_.Init " << executable_path.value(); return false; } - if (!executable_watcher_.Watch(executable_path, delegate.release())) { + if (!executable_watcher_.Watch(executable_path, + delegate.release(), + ui_message_loop_)) { LOG(ERROR) << "executable_watcher_.watch " << executable_path.value(); return false; } diff --git a/chrome/common/service_process_util_posix.h b/chrome/common/service_process_util_posix.h index b0a908b..9928917 100644 --- a/chrome/common/service_process_util_posix.h +++ b/chrome/common/service_process_util_posix.h @@ -21,6 +21,7 @@ MultiProcessLock* TakeServiceRunningLock(bool waiting); #if defined(OS_MACOSX) #include "base/mac/scoped_cftyperef.h" +#include "base/message_loop_proxy.h" #include "content/common/file_path_watcher/file_path_watcher.h" class CommandLine; @@ -67,6 +68,7 @@ struct ServiceProcessState::StateData base::mac::ScopedCFTypeRef<CFDictionaryRef> launchd_conf_; FilePathWatcher executable_watcher_; + scoped_refptr<base::MessageLoopProxy> ui_message_loop_; #endif // OS_MACOSX #if defined(OS_LINUX) scoped_ptr<MultiProcessLock> initializing_lock_; |