chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc - Issue 2098633002: Migrate the one-time notice into the MD settings CBD dialog

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 2098633002: Migrate the one-time notice into the MD settings CBD dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_counters

Patch Set: Initialize to false. 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

« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.h » ('j') | no next file with comments »
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..cae705436b406caca59ca11559146331215cf5cc 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

@@ -360,6 +360,10 @@ void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {

{"warnAboutNonClearedData", IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS},

{"clearsSyncedData", IDS_SETTINGS_CLEAR_DATA_CLEARS_SYNCED_DATA},

{"clearBrowsingDataLearnMoreUrl", IDS_SETTINGS_CLEAR_DATA_LEARN_MORE_URL},

+ {"historyDeletionDialogTitle",

+ IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE},

+ {"historyDeletionDialogOK",

+ IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK},

};

html_source->AddString(

@@ -368,6 +372,12 @@ void AddClearBrowsingDataStrings(content::WebUIDataSource* html_source) {

IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER,

l10n_util::GetStringUTF16(

IDS_SETTINGS_CLEAR_DATA_WEB_HISTORY_URL_IN_FOOTER)));

+ html_source->AddString(

+ "historyDeletionDialogBody",

+ l10n_util::GetStringFUTF16(

+ IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE,

+ l10n_util::GetStringUTF16(

+ IDS_SETTINGS_CLEAR_DATA_WEB_HISTORY_URL_IN_DIALOG)));

AddLocalizedStringsBulk(html_source, localized_strings,

arraysize(localized_strings));