chrome/browser/chromeos/user_cros_settings_provider.cc - Issue 7171018: User Settings on CrOS now shows the managed banner for enrolled devices.

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/user_cros_settings_provider.cc

Issue 7171018: User Settings on CrOS now shows the managed banner for enrolled devices. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed comments. 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/chromeos/user_cros_settings_provider.cc

diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc

index d4303383b6d99ecedc28e1a49568451ee6615f96..dbe93715fe7beb3d35b47cdffb0bea3dae7ef1cf 100644

--- a/chrome/browser/chromeos/user_cros_settings_provider.cc

+++ b/chrome/browser/chromeos/user_cros_settings_provider.cc

@@ -21,6 +21,7 @@

#include "chrome/browser/chromeos/cros_settings_names.h"

#include "chrome/browser/chromeos/login/ownership_service.h"

#include "chrome/browser/chromeos/login/user_manager.h"

+#include "chrome/browser/policy/browser_policy_connector.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/prefs/scoped_user_pref_update.h"

#include "content/browser/browser_thread.h"

@@ -564,7 +565,7 @@ bool UserCrosSettingsProvider::Get(const std::string& path,

PrefService* prefs = g_browser_process->local_state();

*out_value = CreateSettingsBooleanValue(

prefs->GetBoolean(path.c_str()),

- prefs->IsManagedPreference(path.c_str()),

+ g_browser_process->browser_policy_connector()->IsEnterpriseManaged(),

!UserManager::Get()->current_user_is_owner());

return true;

} else if (path == kAccountsPrefUsers) {

« no previous file with comments | « no previous file | chrome/browser/policy/managed_prefs_banner_base.cc » ('j') | no next file with comments »