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

Side by Side Diff: chrome/browser/chromeos/gdata/gdata_cache_metadata.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: 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/gdata/gdata_cache_metadata.h" 5 #include "chrome/browser/chromeos/gdata/gdata_cache_metadata.h"
6 6
7 #include <leveldb/db.h> 7 #include <leveldb/db.h>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/sequenced_task_runner.h" 10 #include "base/sequenced_task_runner.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 void ScanCacheDirectory( 105 void ScanCacheDirectory(
106 const std::vector<FilePath>& cache_paths, 106 const std::vector<FilePath>& cache_paths,
107 GDataCache::CacheSubDirectoryType sub_dir_type, 107 GDataCache::CacheSubDirectoryType sub_dir_type,
108 GDataCacheMetadata::CacheMap* cache_map, 108 GDataCacheMetadata::CacheMap* cache_map,
109 ResourceIdToFilePathMap* processed_file_map) { 109 ResourceIdToFilePathMap* processed_file_map) {
110 DCHECK(cache_map); 110 DCHECK(cache_map);
111 DCHECK(processed_file_map); 111 DCHECK(processed_file_map);
112 112
113 file_util::FileEnumerator enumerator( 113 file_util::FileEnumerator enumerator(
114 cache_paths[sub_dir_type], 114 cache_paths[sub_dir_type],
115 false, // not recursive 115 false, // not recursive
jar (doing other things) 2012/08/06 18:27:02 nit: Just as you did in gdata_cache_unittest.cc, I
Haruki Sato 2012/08/06 23:22:18 Done. Thanks.
116 static_cast<file_util::FileEnumerator::FileType>( 116 (file_util::FileEnumerator::FILES |
117 file_util::FileEnumerator::FILES | 117 file_util::FileEnumerator::SHOW_SYM_LINKS),
118 file_util::FileEnumerator::SHOW_SYM_LINKS),
119 util::kWildCard); 118 util::kWildCard);
120 for (FilePath current = enumerator.Next(); !current.empty(); 119 for (FilePath current = enumerator.Next(); !current.empty();
121 current = enumerator.Next()) { 120 current = enumerator.Next()) {
122 // Extract resource_id and md5 from filename. 121 // Extract resource_id and md5 from filename.
123 std::string resource_id; 122 std::string resource_id;
124 std::string md5; 123 std::string md5;
125 std::string extra_extension; 124 std::string extra_extension;
126 util::ParseCacheFilePath(current, &resource_id, &md5, &extra_extension); 125 util::ParseCacheFilePath(current, &resource_id, &md5, &extra_extension);
127 126
128 // Determine cache state. 127 // Determine cache state.
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 return scoped_ptr<GDataCacheMetadata>( 594 return scoped_ptr<GDataCacheMetadata>(
596 new GDataCacheMetadataDB(blocking_task_runner)); 595 new GDataCacheMetadataDB(blocking_task_runner));
597 } 596 }
598 597
599 void GDataCacheMetadata::AssertOnSequencedWorkerPool() { 598 void GDataCacheMetadata::AssertOnSequencedWorkerPool() {
600 DCHECK(!blocking_task_runner_ || 599 DCHECK(!blocking_task_runner_ ||
601 blocking_task_runner_->RunsTasksOnCurrentThread()); 600 blocking_task_runner_->RunsTasksOnCurrentThread());
602 } 601 }
603 602
604 } // namespace gdata 603 } // namespace gdata
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698