Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1399)

Unified Diff: chrome/common/service_process_util_mac.mm

Issue 968813002: Standardize struct public member variables in ServiceProcessState::StateData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/service_process_util_mac.mm
diff --git a/chrome/common/service_process_util_mac.mm b/chrome/common/service_process_util_mac.mm
index eab7d4eb53387cd0f318d1abfc294c5e62435cf8..819aa9902302a1ff936e1d5ec8e905391b3f1d46 100644
--- a/chrome/common/service_process_util_mac.mm
+++ b/chrome/common/service_process_util_mac.mm
@@ -180,13 +180,13 @@ bool ServiceProcessState::Initialize() {
CFRelease(err);
return false;
}
- state_->launchd_conf_.reset(dict);
+ state_->launchd_conf.reset(dict);
return true;
}
IPC::ChannelHandle ServiceProcessState::GetServiceProcessChannel() {
DCHECK(state_);
- NSDictionary *ns_launchd_conf = base::mac::CFToNSCast(state_->launchd_conf_);
+ NSDictionary* ns_launchd_conf = base::mac::CFToNSCast(state_->launchd_conf);
NSDictionary* socket_dict =
[ns_launchd_conf objectForKey:@ LAUNCH_JOBKEY_SOCKETS];
NSArray* sockets =
@@ -301,7 +301,7 @@ bool ServiceProcessState::RemoveFromAutoRun() {
bool ServiceProcessState::StateData::WatchExecutable() {
base::mac::ScopedNSAutoreleasePool pool;
- NSDictionary* ns_launchd_conf = base::mac::CFToNSCast(launchd_conf_);
+ NSDictionary* ns_launchd_conf = base::mac::CFToNSCast(launchd_conf);
NSString* exe_path = [ns_launchd_conf objectForKey:@ LAUNCH_JOBKEY_PROGRAM];
if (!exe_path) {
DLOG(ERROR) << "No " LAUNCH_JOBKEY_PROGRAM;
@@ -313,15 +313,14 @@ bool ServiceProcessState::StateData::WatchExecutable() {
scoped_ptr<ExecFilePathWatcherCallback> callback(
new ExecFilePathWatcherCallback);
if (!callback->Init(executable_path)) {
- DLOG(ERROR) << "executable_watcher_.Init " << executable_path.value();
+ DLOG(ERROR) << "executable_watcher.Init " << executable_path.value();
return false;
}
- if (!executable_watcher_.Watch(
- executable_path,
James Hawkins 2015/03/02 15:36:27 Please don't change the style of the original file
qi1988.yang 2015/03/03 05:59:19 Done.
- false,
+ if (!executable_watcher.Watch(
+ executable_path, false,
base::Bind(&ExecFilePathWatcherCallback::NotifyPathChanged,
base::Owned(callback.release())))) {
- DLOG(ERROR) << "executable_watcher_.watch " << executable_path.value();
+ DLOG(ERROR) << "executable_watcher.watch " << executable_path.value();
return false;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698