chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2102803002: Settings People Revamp: Add special Disconnect logic for domain profiles

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/settings/md_settings_localized_strings_provider.cc

Issue 2102803002: Settings People Revamp: Add special Disconnect logic for domain profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make behavior same as Options Created 4 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

« chrome/browser/resources/settings/people_page/sync_browser_proxy.js ('K') | « chrome/browser/resources/settings/people_page/sync_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/people_handler.cc » ('j') | chrome/browser/ui/webui/settings/people_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

index 263be6c6fa154f1d961a71f56bd7f545db3d68d4..d3afdba0af27eab42894b960e8a7b7437d13bba4 100644

--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -781,12 +781,15 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {

{"photoDiscardAccessibleText", IDS_SETTINGS_PHOTO_DISCARD_ACCESSIBLE_TEXT},

#else // !defined(OS_CHROMEOS)

{"domainManagedProfile", IDS_SETTINGS_PEOPLE_DOMAIN_MANAGED_PROFILE},

+ {"syncDisconnectManagedProfileExplanation",

+ IDS_SETTINGS_SYNC_DISCONNECT_MANAGED_PROFILE_EXPLANATION},

{"editPerson", IDS_SETTINGS_EDIT_PERSON},

#endif // defined(OS_CHROMEOS)

{"syncOverview", IDS_SETTINGS_SYNC_OVERVIEW},

{"syncSignin", IDS_SETTINGS_SYNC_SIGNIN},

{"syncDisconnect", IDS_SETTINGS_SYNC_DISCONNECT},

{"syncDisconnectTitle", IDS_SETTINGS_SYNC_DISCONNECT_TITLE},

+ {"syncDisconnectExplanation", IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION},

{"syncDisconnectDeleteProfile",

IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE},

{"syncDisconnectConfirm", IDS_SETTINGS_SYNC_DISCONNECT_CONFIRM},

@@ -846,10 +849,6 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {

.spec();

html_source->AddString("syncDashboardUrl", sync_dashboard_url);

html_source->AddString(

- "syncDisconnectExplanation",

- l10n_util::GetStringFUTF16(IDS_SETTINGS_SYNC_DISCONNECT_EXPLANATION,

- base::ASCIIToUTF16(sync_dashboard_url)));

- html_source->AddString(

"activityControlsUrl",

base::ASCIIToUTF16(chrome::kGoogleAccountActivityControlsURL));

}