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/web_applications | |
| 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/web_applications')
| -rw-r--r-- | chrome/browser/web_applications/web_app_mac.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 814a441..0439b32 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/file_util.h" +#include "base/files/file_enumerator.h" #include "base/files/scoped_temp_dir.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h" @@ -142,9 +143,9 @@ bool HasExistingExtensionShim(const base::FilePath& destination_directory, const std::string& extension_id, const base::FilePath& own_basename) { // Check if there any any other shims for the same extension. - file_util::FileEnumerator enumerator(destination_directory, - false /* recursive */, - file_util::FileEnumerator::DIRECTORIES); + base::FileEnumerator enumerator(destination_directory, + false /* recursive */, + base::FileEnumerator::DIRECTORIES); for (base::FilePath shim_path = enumerator.Next(); !shim_path.empty(); shim_path = enumerator.Next()) { if (shim_path.BaseName() != own_basename && |