Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: net/disk_cache/cache_util_posix.cc

Issue 10855002: Change the type of file_type parameter to int, as the parameter actually takes or-ed bitmasks, (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix missing comma. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/base/directory_lister.cc ('k') | webkit/fileapi/file_system_database_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/disk_cache/cache_util.h" 5 #include "net/disk_cache/cache_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 10
11 namespace disk_cache { 11 namespace disk_cache {
12 12
13 bool MoveCache(const FilePath& from_path, const FilePath& to_path) { 13 bool MoveCache(const FilePath& from_path, const FilePath& to_path) {
14 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
15 // For ChromeOS, we don't actually want to rename the cache 15 // For ChromeOS, we don't actually want to rename the cache
16 // directory, because if we do, then it'll get recreated through the 16 // directory, because if we do, then it'll get recreated through the
17 // encrypted filesystem (with encrypted names), and we won't be able 17 // encrypted filesystem (with encrypted names), and we won't be able
18 // to see these directories anymore in an unmounted encrypted 18 // to see these directories anymore in an unmounted encrypted
19 // filesystem, so we just move each item in the cache to a new 19 // filesystem, so we just move each item in the cache to a new
20 // directory. 20 // directory.
21 if (!file_util::CreateDirectory(to_path)) { 21 if (!file_util::CreateDirectory(to_path)) {
22 LOG(ERROR) << "Unable to create destination cache directory."; 22 LOG(ERROR) << "Unable to create destination cache directory.";
23 return false; 23 return false;
24 } 24 }
25 file_util::FileEnumerator iter( 25 file_util::FileEnumerator iter(from_path, false /* not recursive */,
26 from_path, 26 file_util::FileEnumerator::DIRECTORIES |
27 /* recursive */ false, 27 file_util::FileEnumerator::FILES);
28 static_cast<file_util::FileEnumerator::FileType>(
29 file_util::FileEnumerator::DIRECTORIES |
30 file_util::FileEnumerator::FILES));
31 for (FilePath name = iter.Next(); !name.value().empty(); name = iter.Next()) { 28 for (FilePath name = iter.Next(); !name.value().empty(); name = iter.Next()) {
32 FilePath destination = to_path.Append(name.BaseName()); 29 FilePath destination = to_path.Append(name.BaseName());
33 if (!file_util::Move(name, destination)) { 30 if (!file_util::Move(name, destination)) {
34 LOG(ERROR) << "Unable to move cache item."; 31 LOG(ERROR) << "Unable to move cache item.";
35 return false; 32 return false;
36 } 33 }
37 } 34 }
38 return true; 35 return true;
39 #else 36 #else
40 return file_util::Move(from_path, to_path); 37 return file_util::Move(from_path, to_path);
(...skipping 17 matching lines...) Expand all
58 return; 55 return;
59 } 56 }
60 } 57 }
61 } 58 }
62 59
63 bool DeleteCacheFile(const FilePath& name) { 60 bool DeleteCacheFile(const FilePath& name) {
64 return file_util::Delete(name, false); 61 return file_util::Delete(name, false);
65 } 62 }
66 63
67 } // namespace disk_cache 64 } // namespace disk_cache
OLDNEW
« no previous file with comments | « net/base/directory_lister.cc ('k') | webkit/fileapi/file_system_database_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698