remoting/host/policy_watcher.cc - Issue 959033002: Making Chromoting use no GPO provider in PolicyLoaderWin.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: remoting/host/policy_watcher.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: remoting/host/policy_watcher.cc

diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc

index 4026cdd008423f4d94385b5c9664e41e1fe9b444..01acc74651e6b738b0ad50819b66bf3a00ea5af6 100644

--- a/remoting/host/policy_watcher.cc

+++ b/remoting/host/policy_watcher.cc

@@ -266,8 +266,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 »