chrome/browser/chromeos/login/background_view.cc - Issue 7147015: Move user cloud policy to BrowserProcess (was 6979011)

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/chromeos/login/background_view.cc

Issue 7147015: Move user cloud policy to BrowserProcess (was 6979011) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unit_test include breakage Created 9 years, 6 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/chromeos/login/background_view.cc

diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc

index b2a134d3ca863f303309de9b9203be30a789c192..3cc48e5a26bba1c5a7e32454e03e15450bface2f 100644

--- a/chrome/browser/chromeos/login/background_view.cc

+++ b/chrome/browser/chromeos/login/background_view.cc

@@ -358,7 +358,8 @@ void BackgroundView::InitInfoLabels() {

}

policy::CloudPolicySubsystem* cloud_policy =

- g_browser_process->browser_policy_connector()->cloud_policy_subsystem();

+ g_browser_process->browser_policy_connector()->

+ device_cloud_policy_subsystem();

if (cloud_policy) {

// Two-step reset because we want to construct new ObserverRegistrar after

// destruction of old ObserverRegistrar to avoid DCHECK violation because

@@ -448,7 +449,7 @@ void BackgroundView::UpdateEnterpriseInfo() {

std::string status_text;

policy::CloudPolicySubsystem* cloud_policy_subsystem =

- policy_connector->cloud_policy_subsystem();

+ policy_connector->device_cloud_policy_subsystem();

if (cloud_policy_subsystem) {

switch (cloud_policy_subsystem->state()) {

case policy::CloudPolicySubsystem::UNENROLLED: