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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 4 years 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/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 {"siteSettingsCategoryZoomLevels", 1502 {"siteSettingsCategoryZoomLevels",
1503 IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS}, 1503 IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS},
1504 {"siteSettingsAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES}, 1504 {"siteSettingsAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
1505 {"siteSettingsAutomaticDownloads", 1505 {"siteSettingsAutomaticDownloads",
1506 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS}, 1506 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS},
1507 {"siteSettingsBackgroundSync", 1507 {"siteSettingsBackgroundSync",
1508 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC}, 1508 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC},
1509 {"siteSettingsCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA}, 1509 {"siteSettingsCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
1510 {"siteSettingsCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES}, 1510 {"siteSettingsCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
1511 {"siteSettingsHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS}, 1511 {"siteSettingsHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS},
1512 {"siteSettingsKeygen", IDS_SETTINGS_SITE_SETTINGS_KEYGEN},
1513 {"siteSettingsLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION}, 1512 {"siteSettingsLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION},
1514 {"siteSettingsMic", IDS_SETTINGS_SITE_SETTINGS_MIC}, 1513 {"siteSettingsMic", IDS_SETTINGS_SITE_SETTINGS_MIC},
1515 {"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS}, 1514 {"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS},
1516 {"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES}, 1515 {"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
1517 {"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT}, 1516 {"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
1518 {"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH}, 1517 {"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH},
1519 {"siteSettingsPdfDocuments", IDS_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS}, 1518 {"siteSettingsPdfDocuments", IDS_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS},
1520 {"siteSettingsPdfDifferentApplication", 1519 {"siteSettingsPdfDifferentApplication",
1521 IDS_SETTINGS_SITE_SETTINGS_PDF_DIFFERENT_APPLICATION}, 1520 IDS_SETTINGS_SITE_SETTINGS_PDF_DIFFERENT_APPLICATION},
1522 {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS}, 1521 {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
(...skipping 21 matching lines...) Expand all
1544 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES}, 1543 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES},
1545 {"siteSettingsAllowRecentlyClosedSitesRecommended", 1544 {"siteSettingsAllowRecentlyClosedSitesRecommended",
1546 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES_RE COMMENDED}, 1545 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES_RE COMMENDED},
1547 {"siteSettingsBackgroundSyncBlocked", 1546 {"siteSettingsBackgroundSyncBlocked",
1548 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED}, 1547 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED},
1549 {"siteSettingsHandlersAsk", IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK}, 1548 {"siteSettingsHandlersAsk", IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK},
1550 {"siteSettingsHandlersAskRecommended", 1549 {"siteSettingsHandlersAskRecommended",
1551 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED}, 1550 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED},
1552 {"siteSettingsHandlersBlocked", 1551 {"siteSettingsHandlersBlocked",
1553 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED}, 1552 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED},
1554 {"siteSettingsKeygenAllow", IDS_SETTINGS_SITE_SETTINGS_KEYGEN_ALLOW},
1555 {"siteSettingsKeygenBlock", IDS_SETTINGS_SITE_SETTINGS_KEYGEN_BLOCK},
1556 {"siteSettingsKeygenBlockRecommended",
1557 IDS_SETTINGS_SITE_SETTINGS_KEYGEN_BLOCK_RECOMMENDED},
1558 {"siteSettingsAutoDownloadAsk", 1553 {"siteSettingsAutoDownloadAsk",
1559 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK}, 1554 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK},
1560 {"siteSettingsAutoDownloadAskRecommended", 1555 {"siteSettingsAutoDownloadAskRecommended",
1561 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED}, 1556 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED},
1562 {"siteSettingsAutoDownloadBlock", 1557 {"siteSettingsAutoDownloadBlock",
1563 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK}, 1558 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK},
1564 {"siteSettingsUnsandboxedPluginsAsk", 1559 {"siteSettingsUnsandboxedPluginsAsk",
1565 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK}, 1560 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK},
1566 {"siteSettingsUnsandboxedPluginsAskRecommended", 1561 {"siteSettingsUnsandboxedPluginsAskRecommended",
1567 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED}, 1562 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED},
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1853 #if defined(USE_NSS_CERTS) 1848 #if defined(USE_NSS_CERTS)
1854 AddCertificateManagerStrings(html_source); 1849 AddCertificateManagerStrings(html_source);
1855 #endif 1850 #endif
1856 1851
1857 policy_indicator::AddLocalizedStrings(html_source); 1852 policy_indicator::AddLocalizedStrings(html_source);
1858 1853
1859 html_source->SetJsonPath(kLocalizedStringsFile); 1854 html_source->SetJsonPath(kLocalizedStringsFile);
1860 } 1855 }
1861 1856
1862 } // namespace settings 1857 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/content_settings_handler.cc ('k') | chrome/browser/ui/webui/settings/site_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698