diff options
| author | amruthraj@motorola.com <amruthraj@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 18:53:42 +0000 |
|---|---|---|
| committer | amruthraj@motorola.com <amruthraj@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 18:53:42 +0000 |
| commit | 6601392d6b688a8f01e5f9ba8250af921757343f (patch) | |
| tree | 32694d3a0af5397c541055164f2f3bd15ebff79d /chrome/browser/chrome_browser_main.h | |
| parent | ce216ac4284366cfbf9f44343184f311d17a6b14 (diff) | |
| download | chromium_src-6601392d6b688a8f01e5f9ba8250af921757343f.zip chromium_src-6601392d6b688a8f01e5f9ba8250af921757343f.tar.gz chromium_src-6601392d6b688a8f01e5f9ba8250af921757343f.tar.bz2 | |
Clean the SingletonLock only if there is no previous Chromium process running.
BUG=96134
TEST=Launch three Chrome processes to see that the third one doesn't crash.
Patch by amruthraj@motorola.com
Review URL: http://codereview.chromium.org/7796030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100943 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_main.h')
| -rw-r--r-- | chrome/browser/chrome_browser_main.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h index 74ed9ec..dba86af 100644 --- a/chrome/browser/chrome_browser_main.h +++ b/chrome/browser/chrome_browser_main.h @@ -11,6 +11,7 @@ #include "base/metrics/field_trial.h" #include "base/tracked_objects.h" #include "chrome/browser/first_run/first_run.h" +#include "chrome/browser/process_singleton.h" #include "content/browser/browser_main.h" class BrowserProcessImpl; @@ -18,7 +19,6 @@ class FieldTrialSynchronizer; class HistogramSynchronizer; class MetricsService; class PrefService; -class ProcessSingleton; class Profile; class ShutdownWatcherHelper; class TranslateManager; @@ -117,6 +117,7 @@ class ChromeBrowserMainParts : public content::BrowserMainParts { TranslateManager* translate_manager_; Profile* profile_; bool run_message_loop_; + ProcessSingleton::NotifyResult notify_result_; // Initialized in SetupMetricsAndFieldTrials. scoped_refptr<FieldTrialSynchronizer> field_trial_synchronizer_; |