diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 08:09:30 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-21 08:09:30 +0000 |
| commit | 1912cfef3207b30c2691a3f71c524a69ac969b19 (patch) | |
| tree | e13101b5a3c721dfd3a00179a49e43b454dcd5d5 /chrome/browser/process_singleton_linux.cc | |
| parent | 37f876a54ffb14d1630b1c0ebdbeda82ed150816 (diff) | |
| download | chromium_src-1912cfef3207b30c2691a3f71c524a69ac969b19.zip chromium_src-1912cfef3207b30c2691a3f71c524a69ac969b19.tar.gz chromium_src-1912cfef3207b30c2691a3f71c524a69ac969b19.tar.bz2 | |
More solid detection of browser process in chrome_process_util_linux.cc:
- use GetAppOutput instead of popen
- make unexpected conditions fatal (otherwise the tests using this code
would mistakenly assume that there is no running browser process)
Also add a constant for SingletonSocket.
Make necessary adjustments to GetAppOutput - ignore stderr (because fuser
prints the file name to stderr and having stderr in |output| would
require more parsing).
Review URL: http://codereview.chromium.org/77031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux.cc')
| -rw-r--r-- | chrome/browser/process_singleton_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index f37445c..4fba373 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -11,9 +11,10 @@ #include "base/logging.h" #include "base/string_util.h" +#include "chrome/common/chrome_constants.h" ProcessSingleton::ProcessSingleton(const FilePath& user_data_dir) { - socket_path_ = user_data_dir.Append("SingletonSocket"); + socket_path_ = user_data_dir.Append(chrome::kSingletonSocketFilename); } ProcessSingleton::~ProcessSingleton() { |