Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side 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, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 {"clearDeauthorizeContentLicensesCounter", 353 {"clearDeauthorizeContentLicensesCounter",
354 IDS_DEL_CONTENT_LICENSES_COUNTER}, 354 IDS_DEL_CONTENT_LICENSES_COUNTER},
355 {"clearDataHour", IDS_SETTINGS_CLEAR_DATA_HOUR}, 355 {"clearDataHour", IDS_SETTINGS_CLEAR_DATA_HOUR},
356 {"clearDataDay", IDS_SETTINGS_CLEAR_DATA_DAY}, 356 {"clearDataDay", IDS_SETTINGS_CLEAR_DATA_DAY},
357 {"clearDataWeek", IDS_SETTINGS_CLEAR_DATA_WEEK}, 357 {"clearDataWeek", IDS_SETTINGS_CLEAR_DATA_WEEK},
358 {"clearData4Weeks", IDS_SETTINGS_CLEAR_DATA_4WEEKS}, 358 {"clearData4Weeks", IDS_SETTINGS_CLEAR_DATA_4WEEKS},
359 {"clearDataEverything", IDS_SETTINGS_CLEAR_DATA_EVERYTHING}, 359 {"clearDataEverything", IDS_SETTINGS_CLEAR_DATA_EVERYTHING},
360 {"warnAboutNonClearedData", IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS}, 360 {"warnAboutNonClearedData", IDS_SETTINGS_CLEAR_DATA_SOME_STUFF_REMAINS},
361 {"clearsSyncedData", IDS_SETTINGS_CLEAR_DATA_CLEARS_SYNCED_DATA}, 361 {"clearsSyncedData", IDS_SETTINGS_CLEAR_DATA_CLEARS_SYNCED_DATA},
362 {"clearBrowsingDataLearnMoreUrl", IDS_SETTINGS_CLEAR_DATA_LEARN_MORE_URL}, 362 {"clearBrowsingDataLearnMoreUrl", IDS_SETTINGS_CLEAR_DATA_LEARN_MORE_URL},
363 {"historyDeletionDialogTitle",
364 IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_TITLE},
365 {"historyDeletionDialogOK",
366 IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE_OK},
363 }; 367 };
364 368
365 html_source->AddString( 369 html_source->AddString(
366 "otherFormsOfBrowsingHistory", 370 "otherFormsOfBrowsingHistory",
367 l10n_util::GetStringFUTF16( 371 l10n_util::GetStringFUTF16(
368 IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER, 372 IDS_CLEAR_BROWSING_DATA_HISTORY_FOOTER,
369 l10n_util::GetStringUTF16( 373 l10n_util::GetStringUTF16(
370 IDS_SETTINGS_CLEAR_DATA_WEB_HISTORY_URL_IN_FOOTER))); 374 IDS_SETTINGS_CLEAR_DATA_WEB_HISTORY_URL_IN_FOOTER)));
375 html_source->AddString(
376 "historyDeletionDialogBody",
377 l10n_util::GetStringFUTF16(
378 IDS_CLEAR_BROWSING_DATA_HISTORY_NOTICE,
379 l10n_util::GetStringUTF16(
380 IDS_SETTINGS_CLEAR_DATA_WEB_HISTORY_URL_IN_DIALOG)));
371 381
372 AddLocalizedStringsBulk(html_source, localized_strings, 382 AddLocalizedStringsBulk(html_source, localized_strings,
373 arraysize(localized_strings)); 383 arraysize(localized_strings));
374 } 384 }
375 385
376 #if !defined(OS_CHROMEOS) 386 #if !defined(OS_CHROMEOS)
377 void AddDefaultBrowserStrings(content::WebUIDataSource* html_source) { 387 void AddDefaultBrowserStrings(content::WebUIDataSource* html_source) {
378 LocalizedString localized_strings[] = { 388 LocalizedString localized_strings[] = {
379 {"defaultBrowser", IDS_SETTINGS_DEFAULT_BROWSER}, 389 {"defaultBrowser", IDS_SETTINGS_DEFAULT_BROWSER},
380 {"defaultBrowserDefault", IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT}, 390 {"defaultBrowserDefault", IDS_SETTINGS_DEFAULT_BROWSER_DEFAULT},
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 #endif 1200 #endif
1191 AddUsersStrings(html_source); 1201 AddUsersStrings(html_source);
1192 AddWebContentStrings(html_source); 1202 AddWebContentStrings(html_source);
1193 1203
1194 policy_indicator::AddLocalizedStrings(html_source); 1204 policy_indicator::AddLocalizedStrings(html_source);
1195 1205
1196 html_source->SetJsonPath(kLocalizedStringsFile); 1206 html_source->SetJsonPath(kLocalizedStringsFile);
1197 } 1207 }
1198 1208
1199 } // namespace settings 1209 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698