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

Unified Diff: components/policy/core/common/policy_loader_win.cc

Issue 959033002: Making Chromoting use no GPO provider in PolicyLoaderWin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2311
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: components/policy/core/common/policy_loader_win.cc
diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc
index bfa675cd8270edc9824325fa7f8b3d2c49fe9436..74e18c7876d96e0eb3213bce018b878cc300d0b4 100644
--- a/components/policy/core/common/policy_loader_win.cc
+++ b/components/policy/core/common/policy_loader_win.cc
@@ -461,9 +461,10 @@ scoped_ptr<PolicyBundle> PolicyLoaderWin::Load() {
// timeout on it more aggressively. For now, there's no justification for
// the additional effort this would introduce.
- if (is_enterprise || !ReadPolicyFromGPO(scope, &gpo_dict, &status)) {
- VLOG_IF(1, !is_enterprise) << "Failed to read GPO files for " << scope
- << " falling back to registry.";
+ bool is_registry_forced = is_enterprise || gpo_provider_ == nullptr;
+ if (is_registry_forced || !ReadPolicyFromGPO(scope, &gpo_dict, &status)) {
+ VLOG_IF(1, !is_registry_forced) << "Failed to read GPO files for "
+ << scope << " falling back to registry.";
gpo_dict.ReadRegistry(kScopes[i].hive, chrome_policy_key_);
}
« no previous file with comments | « components/policy/core/common/policy_loader_win.h ('k') | components/policy/core/common/policy_loader_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698