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

Side by Side Diff: chrome/common/chrome_constants.cc

Issue 403018: linux: use /proc/self/exe when exec'ing ourselves (Closed)
Patch Set: fixed test Created 11 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « chrome/common/child_process_host.cc ('k') | chrome/test/chrome_process_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/chrome_constants.h" 5 #include "chrome/common/chrome_constants.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 8
9 #define FPL FILE_PATH_LITERAL 9 #define FPL FILE_PATH_LITERAL
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 namespace chrome { 23 namespace chrome {
24 24
25 // The following should not be used for UI strings; they are meant 25 // The following should not be used for UI strings; they are meant
26 // for system strings only. UI changes should be made in the GRD. 26 // for system strings only. UI changes should be made in the GRD.
27 #if defined(OS_WIN) 27 #if defined(OS_WIN)
28 const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe"; 28 const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe";
29 const wchar_t kHelperProcessExecutableName[] = L"chrome.exe"; 29 const wchar_t kHelperProcessExecutableName[] = L"chrome.exe";
30 #elif defined(OS_LINUX) 30 #elif defined(OS_LINUX)
31 const wchar_t kBrowserProcessExecutableName[] = L"chrome"; 31 const wchar_t kBrowserProcessExecutableName[] = L"chrome";
32 const wchar_t kHelperProcessExecutableName[] = L"chrome"; 32 // Helper processes end up with a name of "exe" due to execing via
33 // /proc/self/exe. See bug 22703.
34 const wchar_t kHelperProcessExecutableName[] = L"exe";
33 #elif defined(OS_MACOSX) 35 #elif defined(OS_MACOSX)
34 const wchar_t kBrowserProcessExecutableName[] = PRODUCT_STRING_W; 36 const wchar_t kBrowserProcessExecutableName[] = PRODUCT_STRING_W;
35 const wchar_t kHelperProcessExecutableName[] = PRODUCT_STRING_W L" Helper"; 37 const wchar_t kHelperProcessExecutableName[] = PRODUCT_STRING_W L" Helper";
36 #endif // OS_* 38 #endif // OS_*
37 #if defined(OS_WIN) 39 #if defined(OS_WIN)
38 const wchar_t kBrowserProcessExecutablePath[] = L"chrome.exe"; 40 const wchar_t kBrowserProcessExecutablePath[] = L"chrome.exe";
39 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe"); 41 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe");
40 #elif defined(OS_LINUX) 42 #elif defined(OS_LINUX)
41 const wchar_t kBrowserProcessExecutablePath[] = L"chrome"; 43 const wchar_t kBrowserProcessExecutablePath[] = L"chrome";
42 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome"); 44 const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // because it is useful for testing and not hazardous by itself. 114 // because it is useful for testing and not hazardous by itself.
113 #ifndef NDEBUG 115 #ifndef NDEBUG
114 const bool kRecordModeEnabled = true; 116 const bool kRecordModeEnabled = true;
115 #else 117 #else
116 const bool kRecordModeEnabled = false; 118 const bool kRecordModeEnabled = false;
117 #endif 119 #endif
118 120
119 } // namespace chrome 121 } // namespace chrome
120 122
121 #undef FPL 123 #undef FPL
OLDNEW
« no previous file with comments | « chrome/common/child_process_host.cc ('k') | chrome/test/chrome_process_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698