summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 07:59:52 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-15 07:59:52 +0000
commit6665571f557a5d19b272ef7c6aeb339e0a693868 (patch)
tree072600a62ed1054bdc496f1fb6d39682af2fe6fe /remoting
parent470fb434b6021676aea485427a59ad8cc8c87633 (diff)
downloadchromium_src-6665571f557a5d19b272ef7c6aeb339e0a693868.zip
chromium_src-6665571f557a5d19b272ef7c6aeb339e0a693868.tar.gz
chromium_src-6665571f557a5d19b272ef7c6aeb339e0a693868.tar.bz2
Remove the base::files:: namespace.
Review URL: https://chromiumcodereview.appspot.com/11876031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/host/config_file_watcher.cc4
-rw-r--r--remoting/host/policy_hack/policy_watcher_linux.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc
index 3c096a3..4e6b77a 100644
--- a/remoting/host/config_file_watcher.cc
+++ b/remoting/host/config_file_watcher.cc
@@ -58,7 +58,7 @@ class ConfigFileWatcherImpl
scoped_ptr<base::DelayTimer<ConfigFileWatcherImpl> > config_updated_timer_;
// Monitors the host configuration file.
- scoped_ptr<base::files::FilePathWatcher> config_watcher_;
+ scoped_ptr<base::FilePathWatcher> config_watcher_;
base::WeakPtrFactory<ConfigFileWatcher::Delegate> delegate_weak_factory_;
base::WeakPtr<ConfigFileWatcher::Delegate> delegate_;
@@ -119,7 +119,7 @@ void ConfigFileWatcherImpl::Watch(const FilePath& config_path) {
&ConfigFileWatcherImpl::ReloadConfig));
// Start watching the configuration file.
- config_watcher_.reset(new base::files::FilePathWatcher());
+ config_watcher_.reset(new base::FilePathWatcher());
config_path_ = config_path;
if (!config_watcher_->Watch(
config_path_, false,
diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc
index f9c561f..0df6120 100644
--- a/remoting/host/policy_hack/policy_watcher_linux.cc
+++ b/remoting/host/policy_hack/policy_watcher_linux.cc
@@ -64,7 +64,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
protected:
virtual void StartWatchingInternal() OVERRIDE {
DCHECK(OnPolicyWatcherThread());
- watcher_.reset(new base::files::FilePathWatcher());
+ watcher_.reset(new base::FilePathWatcher());
if (!config_dir_.empty() &&
!watcher_->Watch(
@@ -228,7 +228,7 @@ class PolicyWatcherLinux : public PolicyWatcher {
// decoupling makes it possible to destroy the watcher before the loader's
// destructor is called (e.g. during Stop), since |watcher_| internally holds
// a reference to the loader and keeps it alive.
- scoped_ptr<base::files::FilePathWatcher> watcher_;
+ scoped_ptr<base::FilePathWatcher> watcher_;
// Records last known modification timestamp of |config_dir_|.
base::Time last_modification_file_;