From 4f260d0c40e2b63d2af72d667ca5b0518c2dff84 Mon Sep 17 00:00:00 2001 From: "avi@chromium.org" Date: Thu, 23 Dec 2010 18:35:42 +0000 Subject: 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 --- chrome/common/chrome_constants.cc | 23 +++++++++++------------ chrome/common/chrome_constants.h | 6 +++--- chrome/common/chrome_version_info.cc | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'chrome/common') 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_* diff --git a/chrome/common/chrome_constants.h b/chrome/common/chrome_constants.h index 57e48a86..56be2f8 100644 --- a/chrome/common/chrome_constants.h +++ b/chrome/common/chrome_constants.h @@ -16,9 +16,9 @@ extern const char kChromeVersion[]; extern const char kChromeVersionEnvVar[]; -extern const wchar_t kBrowserProcessExecutableName[]; -extern const wchar_t kHelperProcessExecutableName[]; -extern const wchar_t kBrowserProcessExecutablePath[]; +extern const FilePath::CharType kBrowserProcessExecutableName[]; +extern const FilePath::CharType kHelperProcessExecutableName[]; +extern const FilePath::CharType kBrowserProcessExecutablePath[]; extern const FilePath::CharType kHelperProcessExecutablePath[]; #if defined(OS_MACOSX) extern const FilePath::CharType kFrameworkName[]; diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc index 5157c4a..7bca883 100644 --- a/chrome/common/chrome_version_info.cc +++ b/chrome/common/chrome_version_info.cc @@ -32,19 +32,19 @@ bool VersionInfo::is_valid() const { std::string VersionInfo::Name() const { if (!is_valid()) return std::string(); - return WideToASCII(version_info_->product_name()); + return UTF16ToASCII(version_info_->product_name()); } std::string VersionInfo::Version() const { if (!is_valid()) return std::string(); - return WideToASCII(version_info_->product_version()); + return UTF16ToASCII(version_info_->product_version()); } std::string VersionInfo::LastChange() const { if (!is_valid()) return std::string(); - return WideToASCII(version_info_->last_change()); + return UTF16ToASCII(version_info_->last_change()); } bool VersionInfo::IsOfficialBuild() const { -- cgit v1.1