Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(874)

Unified Diff: chrome/common/chrome_constants.cc

Issue 42306: Make startup_tests build and work on Mac. (Closed)
Patch Set: add app dependency Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/test/startup/startup_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_constants.cc
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc
index 9c248cd7d4fc08f5c4604c02265f06df21ddd000..e0d53bee7f5925af8904d0acb292116a34c6353b 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";
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/test/startup/startup_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698