diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-31 19:05:03 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-31 19:05:03 +0000 |
| commit | 9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98 (patch) | |
| tree | 4bde0c75a3fc5a8a7f6b2e64a050c33526adf814 /chrome/common | |
| parent | 019c257e1bdd8c98128b67d201311f8d90e108a7 (diff) | |
| download | chromium_src-9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98.zip chromium_src-9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98.tar.gz chromium_src-9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98.tar.bz2 | |
Some more changes so that Chromium and Google Chrome do not clash with each other while running at the same time.
BUG=1296800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_constants.cc | 9 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.cc | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/chrome/common/chrome_constants.cc b/chrome/common/chrome_constants.cc index 2e54c0a..2c0dcc8 100644 --- a/chrome/common/chrome_constants.cc +++ b/chrome/common/chrome_constants.cc @@ -8,14 +8,19 @@ namespace chrome { // The following should not be used for UI strings; they are meant // for system strings only. UI changes should be made in the GRD. const wchar_t kBrowserProcessExecutableName[] = L"chrome.exe"; +#if defined(GOOGLE_CHROME_BUILD) const wchar_t kBrowserAppName[] = L"Chrome"; -const wchar_t kMessageWindowClass[] = L"Chrome_MessageWindow"; +const wchar_t kStatsFilename[] = L"ChromeStats"; +#else +const wchar_t kBrowserAppName[] = L"Chromium"; +const wchar_t kStatsFilename[] = L"ChromiumStats"; +#endif const wchar_t kExternalTabWindowClass[] = L"Chrome_ExternalTabContainer"; +const wchar_t kMessageWindowClass[] = L"Chrome_MessageWindow"; const wchar_t kCrashReportLog[] = L"Reported Crashes.txt"; const wchar_t kTestingInterfaceDLL[] = L"testing_interface.dll"; const wchar_t kNotSignedInProfile[] = L"Default"; const wchar_t kNotSignedInID[] = L"not-signed-in"; -const wchar_t kStatsFilename[] = L"ChromeStats"; const wchar_t kBrowserResourcesDll[] = L"chrome.dll"; // filenames diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 7e8d695..7f8c3b6 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -30,7 +30,9 @@ bool GetUserDirectory(int directory_type, std::wstring* result) { bool GetDefaultUserDataDirectory(std::wstring* result) { if (!PathService::Get(base::DIR_LOCAL_APP_DATA, result)) return false; +#if defined(GOOGLE_CHROME_BUILD) file_util::AppendToPath(result, L"Google"); +#endif file_util::AppendToPath(result, chrome::kBrowserAppName); file_util::AppendToPath(result, chrome::kUserDataDirname); return true; |