summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-08 04:53:36 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-08 04:53:36 +0000
commit25a4c1ccaee2b032ee368d733b79ac814efd7c37 (patch)
tree589cd0233167acf4a3fe7bdaf50cea24ad505b7b /remoting
parentaff39ac8a8ea09920b9180ebc09d72c15832f3ad (diff)
downloadchromium_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 'remoting')
-rw-r--r--remoting/host/policy_hack/policy_watcher_linux.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index f3cffea..f0bb9f5 100644
--- a/remoting/host/policy_hack/policy_watcher_linux.cc
+++ b/remoting/host/policy_hack/policy_watcher_linux.cc
@@ -17,6 +17,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
+#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
#include "base/json/json_file_value_serializer.h"
@@ -108,9 +109,9 @@ class PolicyWatcherLinux : public PolicyWatcher {
}
// Enumerate the files and find the most recent modification timestamp.
- file_util::FileEnumerator file_enumerator(config_dir_,
- false,
- file_util::FileEnumerator::FILES);
+ base::FileEnumerator file_enumerator(config_dir_,
+ false,
+ base::FileEnumerator::FILES);
for (base::FilePath config_file = file_enumerator.Next();
!config_file.empty();
config_file = file_enumerator.Next()) {
@@ -129,8 +130,8 @@ class PolicyWatcherLinux : public PolicyWatcher {
DCHECK(OnPolicyWatcherThread());
// Enumerate the files and sort them lexicographically.
std::set<base::FilePath> files;
- file_util::FileEnumerator file_enumerator(config_dir_, false,
- file_util::FileEnumerator::FILES);
+ base::FileEnumerator file_enumerator(config_dir_, false,
+ base::FileEnumerator::FILES);
for (base::FilePath config_file_path = file_enumerator.Next();
!config_file_path.empty(); config_file_path = file_enumerator.Next())
files.insert(config_file_path);