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

Side by Side Diff: remoting/host/policy_watcher.cc

Issue 2682473003: Add support for multiple allowed domains (Closed)
Patch Set: Created 3 years, 10 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 // Most of this code is copied from: 5 // Most of this code is copied from:
6 // src/chrome/browser/policy/asynchronous_policy_loader.{h,cc} 6 // src/chrome/browser/policy/asynchronous_policy_loader.{h,cc}
7 7
8 #include "remoting/host/policy_watcher.h" 8 #include "remoting/host/policy_watcher.h"
9 9
10 #include <utility> 10 #include <utility>
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 owned_policy_provider_(std::move(owned_policy_provider)), 175 owned_policy_provider_(std::move(owned_policy_provider)),
176 owned_policy_service_(std::move(owned_policy_service)) { 176 owned_policy_service_(std::move(owned_policy_service)) {
177 DCHECK(policy_service_); 177 DCHECK(policy_service_);
178 DCHECK(owned_schema_registry_); 178 DCHECK(owned_schema_registry_);
179 179
180 // Initialize the default values for each policy. 180 // Initialize the default values for each policy.
181 default_values_->SetBoolean(key::kRemoteAccessHostFirewallTraversal, true); 181 default_values_->SetBoolean(key::kRemoteAccessHostFirewallTraversal, true);
182 default_values_->SetBoolean(key::kRemoteAccessHostRequireCurtain, false); 182 default_values_->SetBoolean(key::kRemoteAccessHostRequireCurtain, false);
183 default_values_->SetBoolean(key::kRemoteAccessHostMatchUsername, false); 183 default_values_->SetBoolean(key::kRemoteAccessHostMatchUsername, false);
184 default_values_->SetString(key::kRemoteAccessHostClientDomain, std::string()); 184 default_values_->SetString(key::kRemoteAccessHostClientDomain, std::string());
185 default_values_->Set(key::kRemoteAccessHostClientDomainList,
186 base::MakeUnique<base::ListValue>());
185 default_values_->SetString(key::kRemoteAccessHostDomain, std::string()); 187 default_values_->SetString(key::kRemoteAccessHostDomain, std::string());
188 default_values_->Set(key::kRemoteAccessHostDomainList,
189 base::MakeUnique<base::ListValue>());
186 default_values_->SetString(key::kRemoteAccessHostTalkGadgetPrefix, 190 default_values_->SetString(key::kRemoteAccessHostTalkGadgetPrefix,
187 kDefaultHostTalkGadgetPrefix); 191 kDefaultHostTalkGadgetPrefix);
188 default_values_->SetString(key::kRemoteAccessHostTokenUrl, std::string()); 192 default_values_->SetString(key::kRemoteAccessHostTokenUrl, std::string());
189 default_values_->SetString(key::kRemoteAccessHostTokenValidationUrl, 193 default_values_->SetString(key::kRemoteAccessHostTokenValidationUrl,
190 std::string()); 194 std::string());
191 default_values_->SetString( 195 default_values_->SetString(
192 key::kRemoteAccessHostTokenValidationCertificateIssuer, std::string()); 196 key::kRemoteAccessHostTokenValidationCertificateIssuer, std::string());
193 default_values_->SetBoolean(key::kRemoteAccessHostAllowClientPairing, true); 197 default_values_->SetBoolean(key::kRemoteAccessHostAllowClientPairing, true);
194 default_values_->SetBoolean(key::kRemoteAccessHostAllowGnubbyAuth, true); 198 default_values_->SetBoolean(key::kRemoteAccessHostAllowGnubbyAuth, true);
195 default_values_->SetBoolean(key::kRemoteAccessHostAllowRelayedConnection, 199 default_values_->SetBoolean(key::kRemoteAccessHostAllowRelayedConnection,
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 CreateSchemaRegistry())); 388 CreateSchemaRegistry()));
385 #else 389 #else
386 #error OS that is not yet supported by PolicyWatcher code. 390 #error OS that is not yet supported by PolicyWatcher code.
387 #endif 391 #endif
388 392
389 return PolicyWatcher::CreateFromPolicyLoader(std::move(policy_loader)); 393 return PolicyWatcher::CreateFromPolicyLoader(std::move(policy_loader));
390 #endif // !(OS_CHROMEOS) 394 #endif // !(OS_CHROMEOS)
391 } 395 }
392 396
393 } // namespace remoting 397 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698