diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-11 07:54:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-11 07:54:41 -0800 |
| commit | 4070340b4e81f5928e26331b0d599f6d79f15409 (patch) | |
| tree | b861cf013983a17fda2021012c7b76764014b225 /base | |
| parent | 64f036d035f651aacbee082e2601b20c6e843e4e (diff) | |
| parent | 78494470aa829a52d6709093dd00e7704053e806 (diff) | |
| download | external_chromium-4070340b4e81f5928e26331b0d599f6d79f15409.zip external_chromium-4070340b4e81f5928e26331b0d599f6d79f15409.tar.gz external_chromium-4070340b4e81f5928e26331b0d599f6d79f15409.tar.bz2 | |
am 78494470: Merge chromium at 9.0.597.55: Fix conflicts.
* commit '78494470aa829a52d6709093dd00e7704053e806':
Merge chromium at 9.0.597.55: Fix conflicts.
Diffstat (limited to 'base')
| -rw-r--r-- | base/base_paths_linux.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/base_paths_linux.cc b/base/base_paths_linux.cc index f8b99e6..b2f2b57 100644 --- a/base/base_paths_linux.cc +++ b/base/base_paths_linux.cc @@ -105,15 +105,11 @@ bool PathProviderPosix(int key, FilePath* result) { << "Try running from your chromium/src directory."; return false; } -<<<<<<< HEAD - case base::DIR_USER_CACHE: + case base::DIR_CACHE: #ifdef ANDROID NOTREACHED(); return false; #else -======= - case base::DIR_CACHE: ->>>>>>> Chromium.org at 9.0.597.55 scoped_ptr<base::Environment> env(base::Environment::Create()); FilePath cache_dir(base::nix::GetXDGDirectory(env.get(), "XDG_CACHE_HOME", ".cache")); |