diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-08 04:53:36 +0000 |
commit | 25a4c1ccaee2b032ee368d733b79ac814efd7c37 (patch) | |
tree | 589cd0233167acf4a3fe7bdaf50cea24ad505b7b /chrome/browser/extensions/api/storage/settings_backend.cc | |
parent | aff39ac8a8ea09920b9180ebc09d72c15832f3ad (diff) | |
download | chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.zip chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.gz chromium_src-25a4c1ccaee2b032ee368d733b79ac814efd7c37.tar.bz2 |
Move FileEnumerator to its own file, do some refactoring.
It creates a class FileInfo to contain the details rather than using a platform-specific typedef. This allows the accessors GetName, GetSize, etc. to be moved directly to this class (previously they were static helpers on the FileEnumerator class) which makes a bunch of code much cleaner. It also gives reasonable getting and initialization which the previous version lacked.
BUG=175002
Reland of 198820 and 298824
Original review = https://codereview.chromium.org/13165005
R=rvargas@chromium.org
Review URL: https://codereview.chromium.org/16392011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205019 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/storage/settings_backend.cc')
-rw-r--r-- | chrome/browser/extensions/api/storage/settings_backend.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/extensions/api/storage/settings_backend.cc b/chrome/browser/extensions/api/storage/settings_backend.cc index fbcdd17..e1a5d37 100644 --- a/chrome/browser/extensions/api/storage/settings_backend.cc +++ b/chrome/browser/extensions/api/storage/settings_backend.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/settings_backend.h" -#include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/logging.h" #include "chrome/browser/extensions/api/storage/settings_sync_processor.h" #include "chrome/browser/extensions/api/storage/settings_sync_util.h" @@ -115,13 +115,10 @@ std::set<std::string> SettingsBackend::GetKnownExtensionIDs() const { } // Leveldb databases are directories inside base_path_. - file_util::FileEnumerator::FindInfo find_info; - file_util::FileEnumerator extension_dirs( - base_path_, false, file_util::FileEnumerator::DIRECTORIES); + base::FileEnumerator extension_dirs( + base_path_, false, base::FileEnumerator::DIRECTORIES); while (!extension_dirs.Next().empty()) { - extension_dirs.GetFindInfo(&find_info); - base::FilePath extension_dir( - file_util::FileEnumerator::GetFilename(find_info)); + base::FilePath extension_dir = extension_dirs.GetInfo().GetName(); DCHECK(!extension_dir.IsAbsolute()); // Extension IDs are created as std::strings so they *should* be ASCII. std::string maybe_as_ascii(extension_dir.MaybeAsASCII()); |