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

Unified Diff: remoting/host/composite_host_config.h

Issue 10831184: Fix Me2Me host to properly reload config when it changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | « no previous file | remoting/host/composite_host_config.cc » ('j') | remoting/host/remoting_me2me_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | remoting/host/composite_host_config.cc » ('j') | remoting/host/remoting_me2me_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698