diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 21:08:08 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 21:08:08 +0000 |
| commit | 6f926fd60310acd3bac1ecc36dcb4394633b9a41 (patch) | |
| tree | 562b204fdba8e602d1210e07f36acc9212c83a34 /chrome/common | |
| parent | 77c2af208b64e6b8c128efe79c05932d63d33571 (diff) | |
| download | chromium_src-6f926fd60310acd3bac1ecc36dcb4394633b9a41.zip chromium_src-6f926fd60310acd3bac1ecc36dcb4394633b9a41.tar.gz chromium_src-6f926fd60310acd3bac1ecc36dcb4394633b9a41.tar.bz2 | |
Gtk: Add error dialog when profile was in use on a different computer.
BUG=17549
TEST=see bug
Review URL: http://codereview.chromium.org/173222
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 51fa8fb..c62c4db 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -316,6 +316,12 @@ const wchar_t kFirstRun[] = L"first-run"; // you're for some reason tempted to pass them both. const wchar_t kNoFirstRun[] = L"no-first-run"; +#if defined(OS_POSIX) +// Bypass the error dialog when the profile lock couldn't be attained. +// This switch is used during automated testing. +const wchar_t kNoProcessSingletonDialog[] = L"no-process-singleton-dialog"; +#endif + // Enable histograming of tasks served by MessageLoop. See about:histograms/Loop // for results, which show frequency of messages on each thread, including APC // count, object signalling count, etc. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 1bc7da3..e4dc936 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -111,6 +111,10 @@ extern const wchar_t kFirstRun[]; extern const wchar_t kNoFirstRun[]; +#if defined(OS_POSIX) +extern const wchar_t kNoProcessSingletonDialog[]; +#endif + extern const wchar_t kMessageLoopHistogrammer[]; extern const wchar_t kImport[]; |