chrome/browser/browser_process_impl.cc - Issue 10693022: Add support for loading user cloud policy on desktop.

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: chrome/browser/browser_process_impl.cc

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed redundant #ifdef OS_CHROMEOS guard Created 8 years, 4 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:

Index: chrome/browser/browser_process_impl.cc

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc

index 9526a72ec6835755cd4ad7b34470925a28a34860..58b68f48a56e606d22a2888fa9bd93e376c28bcd 100644

--- a/chrome/browser/browser_process_impl.cc

+++ b/chrome/browser/browser_process_impl.cc

@@ -442,8 +442,7 @@ policy::BrowserPolicyConnector* BrowserProcessImpl::browser_policy_connector() {

policy::PolicyService* BrowserProcessImpl::policy_service() {

if (!policy_service_.get()) {

#if defined(ENABLE_CONFIGURATION_POLICY)

- policy_service_.reset(

- browser_policy_connector()->CreatePolicyService(NULL));

+ policy_service_ = browser_policy_connector()->CreatePolicyService(NULL);

#else

policy_service_.reset(new policy::PolicyServiceStub());

#endif