| Index: remoting/host/composite_host_config.cc
|
| diff --git a/remoting/host/composite_host_config.cc b/remoting/host/composite_host_config.cc
|
| index cf130a9decf7271055cfac4fe7856e0554322a6e..23316ff4e0f634d7633308d14e92e03d9bb19ff8 100644
|
| --- a/remoting/host/composite_host_config.cc
|
| +++ b/remoting/host/composite_host_config.cc
|
| @@ -23,9 +23,18 @@ bool CompositeHostConfig::AddConfigPath(const FilePath& path) {
|
| return true;
|
| }
|
|
|
| +bool CompositeHostConfig::Reload() {
|
| + bool result = true;
|
| + for (ScopedVector<JsonHostConfig>::iterator it = configs_.begin();
|
| + it != configs_.end(); ++it) {
|
| + result = result && (*it)->Read();
|
| + }
|
| + return result;
|
| +}
|
| +
|
| bool CompositeHostConfig::GetString(const std::string& path,
|
| std::string* out_value) const {
|
| - for (std::vector<HostConfig*>::const_iterator it = configs_.begin();
|
| + for (ScopedVector<JsonHostConfig>::const_iterator it = configs_.begin();
|
| it != configs_.end(); ++it) {
|
| if ((*it)->GetString(path, out_value))
|
| return true;
|
| @@ -35,7 +44,7 @@ bool CompositeHostConfig::GetString(const std::string& path,
|
|
|
| bool CompositeHostConfig::GetBoolean(const std::string& path,
|
| bool* out_value) const {
|
| - for (std::vector<HostConfig*>::const_iterator it = configs_.begin();
|
| + for (ScopedVector<JsonHostConfig>::const_iterator it = configs_.begin();
|
| it != configs_.end(); ++it) {
|
| if ((*it)->GetBoolean(path, out_value))
|
| return true;
|
|
|