summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_constants.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 19:08:32 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-18 19:08:32 +0000
commita4a0bd9562e38ffff8aaf58031bdde0878ebfea4 (patch)
tree71f1db142ccb47e734c540d4dfc1963629a96b25 /chrome/common/chrome_constants.cc
parent1849d01a855914348bbdc07c7674764daf549358 (diff)
downloadchromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.zip
chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.gz
chromium_src-a4a0bd9562e38ffff8aaf58031bdde0878ebfea4.tar.bz2
Make startup_tests build and work on Mac.
Also ensure that Chromium.app quits properly between the tests. http://crbug.com/8391 Review URL: http://codereview.chromium.org/42306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_constants.cc')
-rw-r--r--chrome/common/chrome_constants.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 9c248cd..e0d53be 100644
--- a/chrome/common/chrome_constants.cc
+++ b/chrome/common/chrome_constants.cc
@@ -16,7 +16,16 @@ namespace chrome {
const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe";
#elif defined(OS_LINUX)
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.app/Contents/MacOS/Chrome";
+#else
+ L"Chromium.app/Contents/MacOS/Chromium";
#endif
+#endif // defined(MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
const wchar_t kBrowserAppName[] = L"Chrome";
const char kStatsFilename[] = "ChromeStats2";