Index: chrome/browser/process_singleton_mac.cc |
diff --git a/chrome/browser/process_singleton_mac.cc b/chrome/browser/process_singleton_mac.cc |
index 253f36966ca028a8cac5d28ca1470c03ab282d28..76313aeb04c7c82fcb753a5c4648cd7a0317f181 100644 |
--- a/chrome/browser/process_singleton_mac.cc |
+++ b/chrome/browser/process_singleton_mac.cc |
@@ -51,17 +51,26 @@ ProcessSingleton::~ProcessSingleton() { |
Cleanup(); |
} |
-ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() { |
- // This space intentionally left blank. |
- return PROCESS_NONE; |
-} |
- |
ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate( |
const NotificationCallback& notification_callback) { |
// Windows tries NotifyOtherProcess() first. |
return Create(notification_callback) ? PROCESS_NONE : PROFILE_IN_USE; |
} |
+void ProcessSingleton::Cleanup() { |
+ // Closing the file also releases the lock. |
+ if (lock_fd_ != -1) { |
+ int rc = HANDLE_EINTR(close(lock_fd_)); |
+ DPCHECK(!rc) << "Closing lock_fd_:"; |
+ } |
+ lock_fd_ = -1; |
+} |
+ |
+ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() { |
+ // This space intentionally left blank. |
+ return PROCESS_NONE; |
+} |
+ |
// Attempt to acquire an exclusive lock on an empty file in the |
// profile directory. Returns |true| if it gets the lock. Returns |
// |false| if the lock is held, or if there is an error. |
@@ -109,12 +118,3 @@ bool ProcessSingleton::Create( |
return true; |
} |
- |
-void ProcessSingleton::Cleanup() { |
- // Closing the file also releases the lock. |
- if (lock_fd_ != -1) { |
- int rc = HANDLE_EINTR(close(lock_fd_)); |
- DPCHECK(!rc) << "Closing lock_fd_:"; |
- } |
- lock_fd_ = -1; |
-} |