Index: remoting/host/composite_host_config.h |
diff --git a/remoting/host/composite_host_config.h b/remoting/host/composite_host_config.h |
index 46b90b45720184a8d0aef602abceb8df28db76ae..a6888831397a4723354706c8e83be689fc92ec92 100644 |
--- a/remoting/host/composite_host_config.h |
+++ b/remoting/host/composite_host_config.h |
@@ -14,6 +14,8 @@ class FilePath; |
namespace remoting { |
+class JsonHostConfig; |
+ |
// CompositeConfig reads multiple configuration files and merges them together. |
class CompositeHostConfig : public HostConfig { |
public: |
@@ -26,6 +28,10 @@ class CompositeHostConfig : public HostConfig { |
// that are added first. |
bool AddConfigPath(const FilePath& path); |
+ // Reloads all configuration files. Returns false if it fails to load one |
simonmorris
2012/08/07 00:43:35
one -> any
Sergey Ulanov
2012/08/07 00:57:03
Done.
|
+ // of the files. |
+ bool Reload(); |
+ |
// HostConfig interface. |
virtual bool GetString(const std::string& path, |
std::string* out_value) const OVERRIDE; |
@@ -33,7 +39,7 @@ class CompositeHostConfig : public HostConfig { |
bool* out_value) const OVERRIDE; |
private: |
- ScopedVector<HostConfig> configs_; |
+ ScopedVector<JsonHostConfig> configs_; |
DISALLOW_COPY_AND_ASSIGN(CompositeHostConfig); |
}; |