diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
| commit | 4f260d0c40e2b63d2af72d667ca5b0518c2dff84 (patch) | |
| tree | 2c976dd8b8dc5c217646627205e61728e8891b03 /chrome/common/chrome_constants.cc | |
| parent | b3ae5db129f88dae153880e84bdabea8ce2ca89b (diff) | |
| download | chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.zip chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.gz chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.bz2 | |
Update file version info/memory details/process utils to use string16.
BUG=23581
TEST=everything still works
Review URL: http://codereview.chromium.org/5968008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_constants.cc')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index 61edf54..97bb58e 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -11,10 +11,8 @@ #if defined(OS_MACOSX) #if defined(GOOGLE_CHROME_BUILD) #define PRODUCT_STRING "Google Chrome" -#define PRODUCT_STRING_W L"Google Chrome" #elif defined(CHROMIUM_BUILD) #define PRODUCT_STRING "Chromium" -#define PRODUCT_STRING_W L"Chromium" #else #error Unknown branding #endif @@ -27,26 +25,27 @@ const char kChromeVersionEnvVar[] = "CHROME_VERSION"; // The following should not be used for UI strings; they are meant // for system strings only. UI changes should be made in the GRD. #if defined(OS_WIN) -const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe"; -const wchar_t kHelperProcessExecutableName[] = L"chrome.exe"; +const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome.exe"); +const FilePath::CharType kHelperProcessExecutableName[] = FPL("chrome.exe"); #elif defined(OS_LINUX) -const wchar_t kBrowserProcessExecutableName[] = L"chrome"; +const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome"); // Helper processes end up with a name of "exe" due to execing via // /proc/self/exe. See bug 22703. -const wchar_t kHelperProcessExecutableName[] = L"exe"; +const FilePath::CharType kHelperProcessExecutableName[] = FPL("exe"); #elif defined(OS_MACOSX) -const wchar_t kBrowserProcessExecutableName[] = PRODUCT_STRING_W; -const wchar_t kHelperProcessExecutableName[] = PRODUCT_STRING_W L" Helper"; +const FilePath::CharType kBrowserProcessExecutableName[] = FPL(PRODUCT_STRING); +const FilePath::CharType kHelperProcessExecutableName[] = + FPL(PRODUCT_STRING " Helper"); #endif // OS_* #if defined(OS_WIN) -const wchar_t kBrowserProcessExecutablePath[] = L"chrome.exe"; +const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome.exe"); const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe"); #elif defined(OS_LINUX) -const wchar_t kBrowserProcessExecutablePath[] = L"chrome"; +const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome"); const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome"); #elif defined(OS_MACOSX) -const wchar_t kBrowserProcessExecutablePath[] = - PRODUCT_STRING_W L".app/Contents/MacOS/" PRODUCT_STRING_W; +const FilePath::CharType kBrowserProcessExecutablePath[] = + FPL(PRODUCT_STRING ".app/Contents/MacOS/" PRODUCT_STRING); const FilePath::CharType kHelperProcessExecutablePath[] = FPL(PRODUCT_STRING " Helper.app/Contents/MacOS/" PRODUCT_STRING " Helper"); #endif // OS_* |