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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/host/policy_watcher.cc

Issue 947353002: Chromoting needs null GPO provider in PolicyLoaderWin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/policy_watcher.cc
diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc
index 58edfce9b662e4a52445edf3ae5b17a9c532c6f0..b17872535688a1f49fb51ea321a189966604a198 100644
--- a/remoting/host/policy_watcher.cc
+++ b/remoting/host/policy_watcher.cc
@@ -283,8 +283,9 @@ scoped_ptr<PolicyWatcher> PolicyWatcher::Create(
// Chromium.
scoped_ptr<policy::AsyncPolicyLoader> policy_loader;
#if defined(OS_WIN)
- policy_loader = policy::PolicyLoaderWin::Create(
- file_task_runner, L"SOFTWARE\\Policies\\Google\\Chrome");
+ policy_loader.reset(new policy::PolicyLoaderWin(
+ file_task_runner, L"SOFTWARE\\Policies\\Google\\Chrome",
+ nullptr)); // nullptr = don't use GPO / always read from the registry.
#elif defined(OS_MACOSX)
CFStringRef bundle_id = CFSTR("com.google.Chrome");
policy_loader.reset(new policy::PolicyLoaderMac(
« no previous file with comments | « components/policy/core/common/policy_loader_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698