summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_paths.cc
diff options
context:
space:
mode:
authorrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-31 19:05:03 +0000
committerrahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-31 19:05:03 +0000
commit9f6d6f17eb09eb20cc5071ed3d839fd8d3785a98 (patch)
tree4bde0c75a3fc5a8a7f6b2e64a050c33526adf814 /chrome/common/chrome_paths.cc
parent019c257e1bdd8c98128b67d201311f8d90e108a7 (diff)
downloadchromium_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/chrome_paths.cc')
-rw-r--r--chrome/common/chrome_paths.cc2
1 files changed, 2 insertions, 0 deletions
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;