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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | remoting/host/composite_host_config.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_ 5 #ifndef REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_
6 #define REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_ 6 #define REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_
7 7
8 #include "remoting/host/host_config.h" 8 #include "remoting/host/host_config.h"
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
12 12
13 class FilePath; 13 class FilePath;
14 14
15 namespace remoting { 15 namespace remoting {
16 16
17 class JsonHostConfig;
18
17 // CompositeConfig reads multiple configuration files and merges them together. 19 // CompositeConfig reads multiple configuration files and merges them together.
18 class CompositeHostConfig : public HostConfig { 20 class CompositeHostConfig : public HostConfig {
19 public: 21 public:
20 CompositeHostConfig(); 22 CompositeHostConfig();
21 virtual ~CompositeHostConfig(); 23 virtual ~CompositeHostConfig();
22 24
23 // Add configuration file specified stored at |path|. Returns false if the 25 // Add configuration file specified stored at |path|. When the same parameter
24 // file with the specified name doesn't exist or can't be opened. When the 26 // is present in more than one file priority is given to those that are added
25 // same parameter is present in more than one file priority is given to those 27 // first.
26 // that are added first. 28 void AddConfigPath(const FilePath& path);
27 bool AddConfigPath(const FilePath& path); 29
30 // Reads all configuration files. Returns false if it fails to load any of the
31 // files.
32 bool Read();
28 33
29 // HostConfig interface. 34 // HostConfig interface.
30 virtual bool GetString(const std::string& path, 35 virtual bool GetString(const std::string& path,
31 std::string* out_value) const OVERRIDE; 36 std::string* out_value) const OVERRIDE;
32 virtual bool GetBoolean(const std::string& path, 37 virtual bool GetBoolean(const std::string& path,
33 bool* out_value) const OVERRIDE; 38 bool* out_value) const OVERRIDE;
34 39
35 private: 40 private:
36 ScopedVector<HostConfig> configs_; 41 ScopedVector<JsonHostConfig> configs_;
37 42
38 DISALLOW_COPY_AND_ASSIGN(CompositeHostConfig); 43 DISALLOW_COPY_AND_ASSIGN(CompositeHostConfig);
39 }; 44 };
40 45
41 } // namespace remoting 46 } // namespace remoting
42 47
43 #endif // REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_ 48 #endif // REMOTING_HOST_COMPOSITE_HOST_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | remoting/host/composite_host_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698