diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 08:32:54 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 08:32:54 +0000 |
| commit | bb9d33be4be1e86a99af7f6d78a0cbc28f5c1fd9 (patch) | |
| tree | 0905b85eb40f3b9923673a87186a00a6a1e0af5b /remoting/host/daemon_process.h | |
| parent | 427919523368f6e621ee55daf370e5b67596ad86 (diff) | |
| download | chromium_src-bb9d33be4be1e86a99af7f6d78a0cbc28f5c1fd9.zip chromium_src-bb9d33be4be1e86a99af7f6d78a0cbc28f5c1fd9.tar.gz chromium_src-bb9d33be4be1e86a99af7f6d78a0cbc28f5c1fd9.tar.bz2 | |
Separate ConfigWatcher interface from ConfigFileWatcher implementation.
BUG=
Review URL: https://codereview.chromium.org/92693005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/daemon_process.h')
| -rw-r--r-- | remoting/host/daemon_process.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/remoting/host/daemon_process.h b/remoting/host/daemon_process.h index 9053e42..b74090d 100644 --- a/remoting/host/daemon_process.h +++ b/remoting/host/daemon_process.h @@ -6,6 +6,7 @@ #define REMOTING_HOST_DAEMON_PROCESS_H_ #include <list> +#include <string> #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -17,7 +18,7 @@ #include "ipc/ipc_channel.h" #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_platform_file.h" -#include "remoting/host/config_file_watcher.h" +#include "remoting/host/config_watcher.h" #include "remoting/host/host_status_monitor.h" #include "remoting/host/worker_process_ipc_delegate.h" @@ -39,7 +40,7 @@ class ScreenResolution; // process running at lower privileges and maintains the list of desktop // sessions. class DaemonProcess - : public ConfigFileWatcher::Delegate, + : public ConfigWatcher::Delegate, public HostStatusMonitor, public WorkerProcessIpcDelegate { public: @@ -56,7 +57,7 @@ class DaemonProcess scoped_refptr<AutoThreadTaskRunner> io_task_runner, const base::Closure& stopped_callback); - // ConfigFileWatcher::Delegate + // ConfigWatcher::Delegate virtual void OnConfigUpdated(const std::string& serialized_config) OVERRIDE; virtual void OnConfigWatcherError() OVERRIDE; @@ -162,7 +163,7 @@ class DaemonProcess // Handles IPC and background I/O tasks. scoped_refptr<AutoThreadTaskRunner> io_task_runner_; - scoped_ptr<ConfigFileWatcher> config_watcher_; + scoped_ptr<ConfigWatcher> config_watcher_; // The configuration file contents. std::string serialized_config_; |