summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 21:55:38 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-02 21:55:38 +0000
commitb8c980160369f7f7c499a6776ea187e23df280ea (patch)
tree77e52582556e732efed541d24a79fcf0409ed1f2
parentd31a85bdeb3860878205088c40711e5db6a215a6 (diff)
downloadchromium_src-b8c980160369f7f7c499a6776ea187e23df280ea.zip
chromium_src-b8c980160369f7f7c499a6776ea187e23df280ea.tar.gz
chromium_src-b8c980160369f7f7c499a6776ea187e23df280ea.tar.bz2
Merge 122971 - ChromeOS: Store the crash dumps / logs in a non-cryptohome mounted directory.
BUG=chromium-os:25089 TEST=manual, see bug. Review URL: http://codereview.chromium.org/9372087 TBR=thestig@chromium.org Review URL: https://chromiumcodereview.appspot.com/9582029 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@124741 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/chrome_paths.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index f72adfc..c33c5bb 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -158,12 +158,17 @@ bool PathProvider(int key, FilePath* result) {
// and annoyed a lot of users.
break;
case chrome::DIR_CRASH_DUMPS:
+#if defined(OS_CHROMEOS)
+ // ChromeOS uses a separate directory. See http://crosbug.com/25089
+ cur = FILE_PATH_LITERAL("/var/log/chrome");
+#else
// The crash reports are always stored relative to the default user data
// directory. This avoids the problem of having to re-initialize the
// exception handler after parsing command line options, which may
// override the location of the app's profile directory.
if (!GetDefaultUserDataDirectory(&cur))
return false;
+#endif
cur = cur.Append(FILE_PATH_LITERAL("Crash Reports"));
create_dir = true;
break;