chrome/browser/ui/webui/options/managed_user_settings_handler.cc - Issue 12088040: Add a SigninAllowed policy.

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/ui/webui/options/managed_user_settings_handler.cc

Issue 12088040: Add a SigninAllowed policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to ToT, another try to upload. Created 7 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:

Index: chrome/browser/ui/webui/options/managed_user_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc

index 0af71b88b3e3f4d9aab78df9fb74211cef3d1932..e48fcabacb0fe77349238b37d65ea089584a2878 100644

--- a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc

@@ -14,6 +14,7 @@

#include "chrome/common/chrome_switches.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_ui.h"

+#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "grit/locale_settings.h"

@@ -49,7 +50,7 @@ void ManagedUserSettingsHandler::GetLocalizedValues(

// Other managed user settings

{ "advancedManagedUserSettings", IDS_ADVANCED_MANAGED_USER_LABEL },

{ "enableSafeSearch", IDS_SAFE_SEARCH_ENABLED },

- { "disableProfileSignIn", IDS_SIGNIN_SYNC_DISABLED },

+ { "allowProfileSignIn", IDS_SIGNIN_SYNC_ALLOWED },

{ "disableHistoryDeletion", IDS_HISTORY_DELETION_DISABLED },

{ "usePassphrase", IDS_USE_PASSPHRASE_LABEL },

{ "setPassphrase", IDS_SET_PASSPHRASE_BUTTON }