diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 05:56:17 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 05:56:17 +0000 |
| commit | 7bc0e693b24a626518f9b0b5eeead31499718ef7 (patch) | |
| tree | cb5b69ba4f095fe9bbc2fbfd58a83d1ae56d60fe /chrome/browser/process_singleton.h | |
| parent | a30ae61f402a6bdcbb4894620ee1981d7564e9a4 (diff) | |
| download | chromium_src-7bc0e693b24a626518f9b0b5eeead31499718ef7.zip chromium_src-7bc0e693b24a626518f9b0b5eeead31499718ef7.tar.gz chromium_src-7bc0e693b24a626518f9b0b5eeead31499718ef7.tar.bz2 | |
Revert 47875 - ProcessSingleton(all): create the lock immediately after failing to connect to an existing process.
ProcessSingletonLinux: if creating the lock fails, try to notify again.
BUG=44417
TEST=manual
Review URL: http://codereview.chromium.org/2066014
TBR=mattm@chromium.org
Review URL: http://codereview.chromium.org/2125015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton.h')
| -rw-r--r-- | chrome/browser/process_singleton.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index d2ee14f..4ae0b10 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h @@ -37,7 +37,6 @@ class ProcessSingleton : public NonThreadSafe { PROCESS_NONE, PROCESS_NOTIFIED, PROFILE_IN_USE, - LOCK_ERROR, }; explicit ProcessSingleton(const FilePath& user_data_dir); @@ -53,20 +52,11 @@ class ProcessSingleton : public NonThreadSafe { // first one, so this function won't find it. NotifyResult NotifyOtherProcess(); - // Notify another process, if available. Otherwise sets ourselves as the - // singleton instance. Returns PROCESS_NONE if we became the singleton - // instance. - NotifyResult NotifyOtherProcessOrCreate(); - #if defined(OS_POSIX) && !defined(OS_MACOSX) // Exposed for testing. We use a timeout on Linux, and in tests we want // this timeout to be short. NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line, - int timeout_seconds, - bool kill_unresponsive); - NotifyResult NotifyOtherProcessWithTimeoutOrCreate( - const CommandLine& command_line, - int timeout_seconds); + int timeout_seconds); #endif // Sets ourself up as the singleton instance. Returns true on success. If |