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

Unified Diff: remoting/host/policy_hack/policy_watcher_linux.cc

Issue 13165005: Move FileEnumerator to its own file, do some refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge, fixes Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_file_dir_job.cc ('k') | third_party/leveldatabase/env_chromium.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/policy_hack/policy_watcher_linux.cc
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index 641af9c065cdc07a17450cbb5ae2e3dcd19b992b..cb63ef0659a4e5e47126ae843b728a0ee514cc51 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"
@@ -110,9 +111,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()) {
@@ -131,8 +132,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);
« no previous file with comments | « net/url_request/url_request_file_dir_job.cc ('k') | third_party/leveldatabase/env_chromium.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698