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

Unified Diff: remoting/host/composite_host_config.cc

Issue 10855249: [Chromoting] The daemon process now starts the networking process and passes the host configuration… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback and rebased on top of https://chromiumcodereview.appspot.com/10829467/ 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
Index: remoting/host/composite_host_config.cc
diff --git a/remoting/host/composite_host_config.cc b/remoting/host/composite_host_config.cc
deleted file mode 100644
index 01f456fa81d3319571a14c3d9b709eb21e297f0d..0000000000000000000000000000000000000000
--- a/remoting/host/composite_host_config.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "remoting/host/composite_host_config.h"
-
-#include "remoting/host/json_host_config.h"
-
-namespace remoting {
-
-CompositeHostConfig::CompositeHostConfig() {
-}
-
-CompositeHostConfig::~CompositeHostConfig() {
-}
-
-void CompositeHostConfig::AddConfigPath(const FilePath& path) {
- configs_.push_back(new JsonHostConfig(path));
-}
-
-bool CompositeHostConfig::Read() {
- 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 (ScopedVector<JsonHostConfig>::const_iterator it = configs_.begin();
- it != configs_.end(); ++it) {
- if ((*it)->GetString(path, out_value))
- return true;
- }
- return false;
-}
-
-bool CompositeHostConfig::GetBoolean(const std::string& path,
- bool* out_value) const {
- for (ScopedVector<JsonHostConfig>::const_iterator it = configs_.begin();
- it != configs_.end(); ++it) {
- if ((*it)->GetBoolean(path, out_value))
- return true;
- }
- return false;
-}
-
-} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698