diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 13:24:05 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:14 +0000 |
| commit | 78494470aa829a52d6709093dd00e7704053e806 (patch) | |
| tree | e01792b7d0f55e7de22cd0e68292c0ae32ca86ad /base | |
| parent | 8bea3fb764c6f317dd1b99e8e02ad87670974bd4 (diff) | |
| download | external_chromium-78494470aa829a52d6709093dd00e7704053e806.zip external_chromium-78494470aa829a52d6709093dd00e7704053e806.tar.gz external_chromium-78494470aa829a52d6709093dd00e7704053e806.tar.bz2 | |
Merge chromium at 9.0.597.55: Fix conflicts.
tab_contents.h:
http://src.chromium.org/viewvc/chrome?view=rev&revision=67659
pref_value_store.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=66755
base_paths_linux.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67202
personal_data_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67344
autofill_manager.cc
http://src.chromium.org/viewvc/chrome?view=rev&revision=67599
Change-Id: I7016d521fa2f2f13d0c50e5609b72ceaae64d8f0
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")); |