chrome/browser/policy/managed_prefs_banner_base.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/policy/managed_prefs_banner_base.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

« no previous file with comments | « chrome/browser/chromeos/user_cros_settings_provider.cc ('k') | chrome/browser/resources/options/chromeos/accounts_options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/managed_prefs_banner_base.cc

diff --git a/chrome/browser/policy/managed_prefs_banner_base.cc b/chrome/browser/policy/managed_prefs_banner_base.cc

index 9ca5fc74be3663b2166bf4665829e8fa0e8df3d1..45c824df33dbfe96397adb579aa00bbdda540496 100644

--- a/chrome/browser/policy/managed_prefs_banner_base.cc

+++ b/chrome/browser/policy/managed_prefs_banner_base.cc

@@ -11,10 +11,6 @@

#include "content/common/notification_details.h"

#include "content/common/notification_type.h"

-#if defined(OS_CHROMEOS)

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

-#endif

namespace policy {

ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* user_prefs,

@@ -97,15 +93,6 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,

AddUserPref(prefs::kPromptForDownload);

AddUserPref(prefs::kEnableTranslate);

break;

-#if defined(OS_CHROMEOS)

- case OPTIONS_PAGE_ACCOUNTS:

- AddLocalStatePref(chromeos::kAccountsPrefAllowGuest);

- AddLocalStatePref(chromeos::kAccountsPrefAllowNewUser);

- AddLocalStatePref(chromeos::kAccountsPrefShowUserNamesOnSignIn);

- AddLocalStatePref(chromeos::kAccountsPrefUsers);

- AddLocalStatePref(chromeos::kSystemTimezone);

- break;

-#endif

default:

NOTREACHED();

}