OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "remoting/host/setup/daemon_controller_delegate_linux.h" | 5 #include "remoting/host/setup/daemon_controller_delegate_linux.h" |
6 | 6 |
7 #include <unistd.h> | 7 #include <unistd.h> |
8 | 8 |
9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 return nullptr; | 132 return nullptr; |
133 | 133 |
134 scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue()); | 134 scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue()); |
135 std::string value; | 135 std::string value; |
136 if (config->GetString(kHostIdConfigPath, &value)) { | 136 if (config->GetString(kHostIdConfigPath, &value)) { |
137 result->SetString(kHostIdConfigPath, value); | 137 result->SetString(kHostIdConfigPath, value); |
138 } | 138 } |
139 if (config->GetString(kXmppLoginConfigPath, &value)) { | 139 if (config->GetString(kXmppLoginConfigPath, &value)) { |
140 result->SetString(kXmppLoginConfigPath, value); | 140 result->SetString(kXmppLoginConfigPath, value); |
141 } | 141 } |
142 return result.Pass(); | 142 return result; |
143 } | 143 } |
144 | 144 |
145 void DaemonControllerDelegateLinux::SetConfigAndStart( | 145 void DaemonControllerDelegateLinux::SetConfigAndStart( |
146 scoped_ptr<base::DictionaryValue> config, | 146 scoped_ptr<base::DictionaryValue> config, |
147 bool consent, | 147 bool consent, |
148 const DaemonController::CompletionCallback& done) { | 148 const DaemonController::CompletionCallback& done) { |
149 // Add the user to chrome-remote-desktop group first. | 149 // Add the user to chrome-remote-desktop group first. |
150 std::vector<std::string> args; | 150 std::vector<std::string> args; |
151 args.push_back("--add-user"); | 151 args.push_back("--add-user"); |
152 if (!RunHostScript(args)) { | 152 if (!RunHostScript(args)) { |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 // Crash dump collection is not implemented on Linux yet. | 222 // Crash dump collection is not implemented on Linux yet. |
223 // http://crbug.com/130678. | 223 // http://crbug.com/130678. |
224 DaemonController::UsageStatsConsent consent; | 224 DaemonController::UsageStatsConsent consent; |
225 consent.supported = false; | 225 consent.supported = false; |
226 consent.allowed = false; | 226 consent.allowed = false; |
227 consent.set_by_policy = false; | 227 consent.set_by_policy = false; |
228 return consent; | 228 return consent; |
229 } | 229 } |
230 | 230 |
231 scoped_refptr<DaemonController> DaemonController::Create() { | 231 scoped_refptr<DaemonController> DaemonController::Create() { |
232 scoped_ptr<DaemonController::Delegate> delegate( | 232 return new DaemonController( |
233 new DaemonControllerDelegateLinux()); | 233 make_scoped_ptr(new DaemonControllerDelegateLinux())); |
234 return new DaemonController(delegate.Pass()); | |
235 } | 234 } |
236 | 235 |
237 } // namespace remoting | 236 } // namespace remoting |
OLD | NEW |