diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 18:07:51 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-23 18:07:51 +0000 |
| commit | 075a7253bc09178cb94e44b4ae08f5ad1d00f07a (patch) | |
| tree | 3102e07f44a1361d31d41ce15b28c0cb56efa290 /chrome/common/chrome_constants.cc | |
| parent | d61653713c71eeff68b379e60a0e44545921994c (diff) | |
| download | chromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.zip chromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.tar.gz chromium_src-075a7253bc09178cb94e44b4ae08f5ad1d00f07a.tar.bz2 | |
Create a ChromeProcessUtil for the Mac, and enable it in the tests.
Review URL: http://codereview.chromium.org/95009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_constants.cc')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index 94d8edb..2ca8f0c 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -18,14 +18,24 @@ const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe"; const wchar_t kBrowserProcessExecutableName[] = L"chrome"; #elif defined(OS_MACOSX) const wchar_t kBrowserProcessExecutableName[] = -// TODO(thomasvl): Un-hardcode path inside the bundle in case we want to use -// this constant for something other than test code. +#if defined(GOOGLE_CHROME_BUILD) + L"Chrome"; +#else + L"Chromium"; +#endif // GOOGLE_CHROME_BUILD +#endif // OS_* +#if defined(OS_WIN) +const wchar_t kBrowserProcessExecutablePath[] = L"chrome.exe"; +#elif defined(OS_LINUX) +const wchar_t kBrowserProcessExecutablePath[] = L"chrome"; +#elif defined(OS_MACOSX) +const wchar_t kBrowserProcessExecutablePath[] = #if defined(GOOGLE_CHROME_BUILD) L"Chrome.app/Contents/MacOS/Chrome"; #else L"Chromium.app/Contents/MacOS/Chromium"; -#endif -#endif // defined(MACOSX) +#endif // GOOGLE_CHROME_BUILD +#endif // OS_* #if defined(GOOGLE_CHROME_BUILD) const wchar_t kBrowserAppName[] = L"Chrome"; const char kStatsFilename[] = "ChromeStats2"; |