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

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

Issue 2688793002: MD Settings: Update Protected Content for redesign (Closed)
Patch Set: Originally reviewed patch Created 3 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:
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 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
1486 {"searchEnginesManageExtension", 1486 {"searchEnginesManageExtension",
1487 IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION}, 1487 IDS_SETTINGS_SEARCH_ENGINES_MANAGE_EXTENSION},
1488 }; 1488 };
1489 AddLocalizedStringsBulk(html_source, localized_strings, 1489 AddLocalizedStringsBulk(html_source, localized_strings,
1490 arraysize(localized_strings)); 1490 arraysize(localized_strings));
1491 } 1491 }
1492 1492
1493 void AddSiteSettingsStrings(content::WebUIDataSource* html_source, 1493 void AddSiteSettingsStrings(content::WebUIDataSource* html_source,
1494 Profile* profile) { 1494 Profile* profile) {
1495 LocalizedString localized_strings[] = { 1495 LocalizedString localized_strings[] = {
1496 {"addSiteHeader", IDS_SETTINGS_ADD_SITE_HEADER}, 1496 {"addSiteHeader", IDS_SETTINGS_ADD_SITE_HEADER},
1497 {"addSiteLink", IDS_SETTINGS_ADD_SITE_LINK}, 1497 {"addSiteLink", IDS_SETTINGS_ADD_SITE_LINK},
1498 {"addSite", IDS_SETTINGS_ADD_SITE}, 1498 {"addSite", IDS_SETTINGS_ADD_SITE},
1499 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE}, 1499 {"cookieAppCache", IDS_SETTINGS_COOKIES_APPLICATION_CACHE},
1500 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE}, 1500 {"cookieCacheStorage", IDS_SETTINGS_COOKIES_CACHE_STORAGE},
1501 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID}, 1501 {"cookieChannelId", IDS_SETTINGS_COOKIES_CHANNEL_ID},
1502 {"cookieDatabaseStorage", IDS_SETTINGS_COOKIES_DATABASE_STORAGE}, 1502 {"cookieDatabaseStorage", IDS_SETTINGS_COOKIES_DATABASE_STORAGE},
1503 {"cookieFileSystem", IDS_SETTINGS_COOKIES_FILE_SYSTEM}, 1503 {"cookieFileSystem", IDS_SETTINGS_COOKIES_FILE_SYSTEM},
1504 {"cookieFlashLso", IDS_SETTINGS_COOKIES_FLASH_LSO}, 1504 {"cookieFlashLso", IDS_SETTINGS_COOKIES_FLASH_LSO},
1505 {"cookieLocalStorage", IDS_SETTINGS_COOKIES_LOCAL_STORAGE}, 1505 {"cookieLocalStorage", IDS_SETTINGS_COOKIES_LOCAL_STORAGE},
1506 {"cookieMediaLicense", IDS_SETTINGS_COOKIES_MEDIA_LICENSE}, 1506 {"cookieMediaLicense", IDS_SETTINGS_COOKIES_MEDIA_LICENSE},
1507 {"cookiePlural", IDS_SETTINGS_COOKIES_PLURAL_COOKIES}, 1507 {"cookiePlural", IDS_SETTINGS_COOKIES_PLURAL_COOKIES},
1508 {"cookieServiceWorker", IDS_SETTINGS_COOKIES_SERVICE_WORKER}, 1508 {"cookieServiceWorker", IDS_SETTINGS_COOKIES_SERVICE_WORKER},
1509 {"cookieSingular", IDS_SETTINGS_COOKIES_SINGLE_COOKIE}, 1509 {"cookieSingular", IDS_SETTINGS_COOKIES_SINGLE_COOKIE},
1510 {"embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST}, 1510 {"embeddedOnHost", IDS_EXCEPTIONS_GEOLOCATION_EMBEDDED_ON_HOST},
1511 {"appCacheManifest", 1511 {"appCacheManifest", IDS_SETTINGS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL},
1512 IDS_SETTINGS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL}, 1512 {"cacheStorageLastModified",
1513 {"cacheStorageLastModified", 1513 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
1514 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL}, 1514 {"cacheStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1515 {"cacheStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1515 {"cacheStorageSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1516 {"cacheStorageSize", 1516 {"channelIdServerId", IDS_SETTINGS_COOKIES_CHANNEL_ID_ORIGIN_LABEL},
1517 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1517 {"channelIdType", IDS_SETTINGS_COOKIES_CHANNEL_ID_TYPE_LABEL},
1518 {"channelIdServerId", IDS_SETTINGS_COOKIES_CHANNEL_ID_ORIGIN_LABEL}, 1518 {"channelIdCreated", IDS_SETTINGS_COOKIES_CHANNEL_ID_CREATED_LABEL},
1519 {"channelIdType", IDS_SETTINGS_COOKIES_CHANNEL_ID_TYPE_LABEL}, 1519 {"channelIdExpires", IDS_SETTINGS_COOKIES_CHANNEL_ID_EXPIRES_LABEL},
1520 {"channelIdCreated", IDS_SETTINGS_COOKIES_CHANNEL_ID_CREATED_LABEL}, 1520 {"cookieAccessibleToScript",
1521 {"channelIdExpires", IDS_SETTINGS_COOKIES_CHANNEL_ID_EXPIRES_LABEL}, 1521 IDS_SETTINGS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_LABEL},
1522 {"cookieAccessibleToScript", 1522 {"cookieLastAccessed", IDS_SETTINGS_COOKIES_LAST_ACCESSED_LABEL},
1523 IDS_SETTINGS_COOKIES_COOKIE_ACCESSIBLE_TO_SCRIPT_LABEL}, 1523 {"cookieContent", IDS_SETTINGS_COOKIES_COOKIE_CONTENT_LABEL},
1524 {"cookieLastAccessed", IDS_SETTINGS_COOKIES_LAST_ACCESSED_LABEL}, 1524 {"cookieCreated", IDS_SETTINGS_COOKIES_COOKIE_CREATED_LABEL},
1525 {"cookieContent", IDS_SETTINGS_COOKIES_COOKIE_CONTENT_LABEL}, 1525 {"cookieDomain", IDS_SETTINGS_COOKIES_COOKIE_DOMAIN_LABEL},
1526 {"cookieCreated", IDS_SETTINGS_COOKIES_COOKIE_CREATED_LABEL}, 1526 {"cookieExpires", IDS_SETTINGS_COOKIES_COOKIE_EXPIRES_LABEL},
1527 {"cookieDomain", IDS_SETTINGS_COOKIES_COOKIE_DOMAIN_LABEL}, 1527 {"cookieName", IDS_SETTINGS_COOKIES_COOKIE_NAME_LABEL},
1528 {"cookieExpires", IDS_SETTINGS_COOKIES_COOKIE_EXPIRES_LABEL}, 1528 {"cookiePath", IDS_SETTINGS_COOKIES_COOKIE_PATH_LABEL},
1529 {"cookieName", IDS_SETTINGS_COOKIES_COOKIE_NAME_LABEL}, 1529 {"cookieSendFor", IDS_SETTINGS_COOKIES_COOKIE_SENDFOR_LABEL},
1530 {"cookiePath", IDS_SETTINGS_COOKIES_COOKIE_PATH_LABEL}, 1530 {"fileSystemOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1531 {"cookieSendFor", IDS_SETTINGS_COOKIES_COOKIE_SENDFOR_LABEL}, 1531 {"fileSystemPersistentUsage",
1532 {"fileSystemOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1532 IDS_SETTINGS_COOKIES_FILE_SYSTEM_PERSISTENT_USAGE_LABEL},
1533 {"fileSystemPersistentUsage", 1533 {"fileSystemTemporaryUsage",
1534 IDS_SETTINGS_COOKIES_FILE_SYSTEM_PERSISTENT_USAGE_LABEL}, 1534 IDS_SETTINGS_COOKIES_FILE_SYSTEM_TEMPORARY_USAGE_LABEL},
1535 {"fileSystemTemporaryUsage", 1535 {"indexedDbSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1536 IDS_SETTINGS_COOKIES_FILE_SYSTEM_TEMPORARY_USAGE_LABEL}, 1536 {"indexedDbLastModified",
1537 {"indexedDbSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1537 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
1538 {"indexedDbLastModified", 1538 {"indexedDbOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1539 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL}, 1539 {"localStorageLastModified",
1540 {"indexedDbOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1540 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
1541 {"localStorageLastModified", 1541 {"localStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1542 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL}, 1542 {"localStorageSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1543 {"localStorageOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1543 {"mediaLicenseOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1544 {"localStorageSize", 1544 {"mediaLicenseSize", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1545 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1545 {"mediaLicenseLastModified",
1546 {"mediaLicenseOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1546 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL},
1547 {"mediaLicenseSize", 1547 {"serviceWorkerOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL},
1548 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1548 {"serviceWorkerScopes", IDS_SETTINGS_COOKIES_SERVICE_WORKER_SCOPES_LABEL},
1549 {"mediaLicenseLastModified", 1549 {"serviceWorkerSize",
1550 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL}, 1550 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL},
1551 {"serviceWorkerOrigin", IDS_SETTINGS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL}, 1551 {"webdbDesc", IDS_SETTINGS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL},
1552 {"serviceWorkerScopes", IDS_SETTINGS_COOKIES_SERVICE_WORKER_SCOPES_LABEL}, 1552 {"siteSettingsCategoryPageTitle", IDS_SETTINGS_SITE_SETTINGS_CATEGORY},
1553 {"serviceWorkerSize", 1553 {"siteSettingsCategoryAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
1554 IDS_SETTINGS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL}, 1554 {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
1555 {"webdbDesc", IDS_SETTINGS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL}, 1555 {"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
1556 {"siteSettingsCategoryPageTitle", IDS_SETTINGS_SITE_SETTINGS_CATEGORY}, 1556 {"siteSettingsCategoryHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS},
1557 {"siteSettingsCategoryAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES}, 1557 {"siteSettingsCategoryImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
1558 {"siteSettingsCategoryCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA}, 1558 {"siteSettingsCategoryLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION},
1559 {"siteSettingsCategoryCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES}, 1559 {"siteSettingsCategoryJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
1560 {"siteSettingsCategoryHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS}, 1560 {"siteSettingsCategoryMicrophone", IDS_SETTINGS_SITE_SETTINGS_MIC},
1561 {"siteSettingsCategoryImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES}, 1561 {"siteSettingsCategoryNotifications",
1562 {"siteSettingsCategoryLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION}, 1562 IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS},
1563 {"siteSettingsCategoryJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT}, 1563 {"siteSettingsCategoryPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
1564 {"siteSettingsCategoryMicrophone", IDS_SETTINGS_SITE_SETTINGS_MIC}, 1564 {"siteSettingsCategoryZoomLevels", IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS},
1565 {"siteSettingsCategoryNotifications", 1565 {"siteSettingsAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES},
1566 IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS}, 1566 {"siteSettingsAutomaticDownloads",
1567 {"siteSettingsCategoryPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS}, 1567 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS},
1568 {"siteSettingsCategoryZoomLevels", 1568 {"siteSettingsBackgroundSync", IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC},
1569 IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS}, 1569 {"siteSettingsCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA},
1570 {"siteSettingsAllSites", IDS_SETTINGS_SITE_SETTINGS_ALL_SITES}, 1570 {"siteSettingsCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES},
1571 {"siteSettingsAutomaticDownloads", 1571 {"siteSettingsHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS},
1572 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOADS}, 1572 {"siteSettingsLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION},
1573 {"siteSettingsBackgroundSync", 1573 {"siteSettingsMic", IDS_SETTINGS_SITE_SETTINGS_MIC},
1574 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC}, 1574 {"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS},
1575 {"siteSettingsCamera", IDS_SETTINGS_SITE_SETTINGS_CAMERA}, 1575 {"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES},
1576 {"siteSettingsCookies", IDS_SETTINGS_SITE_SETTINGS_COOKIES}, 1576 {"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT},
1577 {"siteSettingsHandlers", IDS_SETTINGS_SITE_SETTINGS_HANDLERS}, 1577 {"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH},
1578 {"siteSettingsLocation", IDS_SETTINGS_SITE_SETTINGS_LOCATION}, 1578 {"siteSettingsPdfDocuments", IDS_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS},
1579 {"siteSettingsMic", IDS_SETTINGS_SITE_SETTINGS_MIC}, 1579 {"siteSettingsPdfDifferentApplication",
1580 {"siteSettingsNotifications", IDS_SETTINGS_SITE_SETTINGS_NOTIFICATIONS}, 1580 IDS_SETTINGS_SITE_SETTINGS_PDF_DIFFERENT_APPLICATION},
1581 {"siteSettingsImages", IDS_SETTINGS_SITE_SETTINGS_IMAGES}, 1581 {"siteSettingsProtectedContent",
1582 {"siteSettingsJavascript", IDS_SETTINGS_SITE_SETTINGS_JAVASCRIPT}, 1582 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT},
1583 {"siteSettingsFlash", IDS_SETTINGS_SITE_SETTINGS_FLASH}, 1583 {"siteSettingsProtectedContentEnable",
1584 {"siteSettingsPdfDocuments", IDS_SETTINGS_SITE_SETTINGS_PDF_DOCUMENTS}, 1584 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE},
1585 {"siteSettingsPdfDifferentApplication", 1585 #if defined(OS_CHROMEOS) || defined(OS_WIN)
1586 IDS_SETTINGS_SITE_SETTINGS_PDF_DIFFERENT_APPLICATION}, 1586 {"siteSettingsProtectedContentIdentifiersExplanation",
1587 {"siteSettingsProtectedContent", 1587 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_IDENTIFIERS_EXPLANATION},
1588 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT}, 1588 {"siteSettingsProtectedContentEnableIdentifiers",
1589 {"siteSettingsProtectedContentExplanation", 1589 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE_IDENTIFIERS},
1590 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_EXPLANATION}, 1590 #endif
tommycli 2017/02/10 00:22:23 Wow the diff looks awful. But the only changes are
stevenjb 2017/02/10 00:32:31 Might be worth uploading a formatting only CL, you
1591 {"siteSettingsProtectedContentEnable", 1591 {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS},
1592 IDS_SETTINGS_SITE_SETTINGS_PROTECTED_CONTENT_ENABLE}, 1592 {"siteSettingsUnsandboxedPlugins",
1593 {"siteSettingsPopups", IDS_SETTINGS_SITE_SETTINGS_POPUPS}, 1593 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS},
1594 {"siteSettingsUnsandboxedPlugins", 1594 {"siteSettingsUsbDevices", IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES},
1595 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS}, 1595 {"siteSettingsZoomLevels", IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS},
1596 {"siteSettingsUsbDevices", IDS_SETTINGS_SITE_SETTINGS_USB_DEVICES}, 1596 {"siteSettingsNoZoomedSites", IDS_SETTINGS_SITE_SETTINGS_NO_ZOOMED_SITES},
1597 {"siteSettingsZoomLevels", IDS_SETTINGS_SITE_SETTINGS_ZOOM_LEVELS}, 1597 {"siteSettingsMaySaveCookies", IDS_SETTINGS_SITE_SETTINGS_MAY_SAVE_COOKIES},
1598 {"siteSettingsNoZoomedSites", IDS_SETTINGS_SITE_SETTINGS_NO_ZOOMED_SITES}, 1598 {"siteSettingsAskFirst", IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST},
1599 {"siteSettingsMaySaveCookies", 1599 {"siteSettingsAskFirstRecommended",
1600 IDS_SETTINGS_SITE_SETTINGS_MAY_SAVE_COOKIES}, 1600 IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST_RECOMMENDED},
1601 {"siteSettingsAskFirst", IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST}, 1601 {"siteSettingsAskBeforeAccessing",
1602 {"siteSettingsAskFirstRecommended", 1602 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING},
1603 IDS_SETTINGS_SITE_SETTINGS_ASK_FIRST_RECOMMENDED}, 1603 {"siteSettingsAskBeforeAccessingRecommended",
1604 {"siteSettingsAskBeforeAccessing", 1604 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING_RECOMMENDED},
1605 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING}, 1605 {"siteSettingsAskBeforeSending",
1606 {"siteSettingsAskBeforeAccessingRecommended", 1606 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING},
1607 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_ACCESSING_RECOMMENDED}, 1607 {"siteSettingsAskBeforeSendingRecommended",
1608 {"siteSettingsAskBeforeSending", 1608 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING_RECOMMENDED},
1609 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING}, 1609 {"siteSettingsFlashAllow", IDS_SETTINGS_SITE_SETTINGS_FLASH_ALLOW},
1610 {"siteSettingsAskBeforeSendingRecommended", 1610 {"siteSettingsFlashBlock", IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK},
1611 IDS_SETTINGS_SITE_SETTINGS_ASK_BEFORE_SENDING_RECOMMENDED}, 1611 {"siteSettingsAllowRecentlyClosedSites",
1612 {"siteSettingsFlashAllow", IDS_SETTINGS_SITE_SETTINGS_FLASH_ALLOW}, 1612 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES},
1613 {"siteSettingsFlashBlock", IDS_SETTINGS_SITE_SETTINGS_FLASH_BLOCK}, 1613 {"siteSettingsAllowRecentlyClosedSitesRecommended",
1614 {"siteSettingsAllowRecentlyClosedSites", 1614 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES_RECO MMENDED},
1615 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES}, 1615 {"siteSettingsBackgroundSyncBlocked",
1616 {"siteSettingsAllowRecentlyClosedSitesRecommended", 1616 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED},
1617 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_ALLOW_RECENTLY_CLOSED_SITES_RE COMMENDED}, 1617 {"siteSettingsHandlersAsk", IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK},
1618 {"siteSettingsBackgroundSyncBlocked", 1618 {"siteSettingsHandlersAskRecommended",
1619 IDS_SETTINGS_SITE_SETTINGS_BACKGROUND_SYNC_BLOCKED}, 1619 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED},
1620 {"siteSettingsHandlersAsk", IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK}, 1620 {"siteSettingsHandlersBlocked",
1621 {"siteSettingsHandlersAskRecommended", 1621 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED},
1622 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_ASK_RECOMMENDED}, 1622 {"siteSettingsAutoDownloadAsk",
1623 {"siteSettingsHandlersBlocked", 1623 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK},
1624 IDS_SETTINGS_SITE_SETTINGS_HANDLERS_BLOCKED}, 1624 {"siteSettingsAutoDownloadAskRecommended",
1625 {"siteSettingsAutoDownloadAsk", 1625 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED},
1626 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK}, 1626 {"siteSettingsAutoDownloadBlock",
1627 {"siteSettingsAutoDownloadAskRecommended", 1627 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK},
1628 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_ASK_RECOMMENDED}, 1628 {"siteSettingsUnsandboxedPluginsAsk",
1629 {"siteSettingsAutoDownloadBlock", 1629 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK},
1630 IDS_SETTINGS_SITE_SETTINGS_AUTOMATIC_DOWNLOAD_BLOCK}, 1630 {"siteSettingsUnsandboxedPluginsAskRecommended",
1631 {"siteSettingsUnsandboxedPluginsAsk", 1631 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED},
1632 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK}, 1632 {"siteSettingsUnsandboxedPluginsBlock",
1633 {"siteSettingsUnsandboxedPluginsAskRecommended", 1633 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCK},
1634 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_ASK_RECOMMENDED}, 1634 {"siteSettingsDontShowImages", IDS_SETTINGS_SITE_SETTINGS_DONT_SHOW_IMAGES},
1635 {"siteSettingsUnsandboxedPluginsBlock", 1635 {"siteSettingsShowAll", IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL},
1636 IDS_SETTINGS_SITE_SETTINGS_UNSANDBOXED_PLUGINS_BLOCK}, 1636 {"siteSettingsShowAllRecommended",
1637 {"siteSettingsDontShowImages", 1637 IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL_RECOMMENDED},
1638 IDS_SETTINGS_SITE_SETTINGS_DONT_SHOW_IMAGES}, 1638 {"siteSettingsCookiesAllowed",
1639 {"siteSettingsShowAll", IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL}, 1639 IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES},
1640 {"siteSettingsShowAllRecommended", 1640 {"siteSettingsCookiesAllowedRecommended",
1641 IDS_SETTINGS_SITE_SETTINGS_SHOW_ALL_RECOMMENDED}, 1641 IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES_RECOMMENDED},
1642 {"siteSettingsCookiesAllowed", 1642 {"siteSettingsAllow", IDS_SETTINGS_SITE_SETTINGS_ALLOW},
1643 IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES}, 1643 {"siteSettingsBlock", IDS_SETTINGS_SITE_SETTINGS_BLOCK},
1644 {"siteSettingsCookiesAllowedRecommended", 1644 {"siteSettingsSessionOnly", IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY},
1645 IDS_SETTINGS_SITE_SETTINGS_COOKIES_ALLOW_SITES_RECOMMENDED}, 1645 {"siteSettingsAllowed", IDS_SETTINGS_SITE_SETTINGS_ALLOWED},
1646 {"siteSettingsAllow", IDS_SETTINGS_SITE_SETTINGS_ALLOW}, 1646 {"siteSettingsAllowedRecommended",
1647 {"siteSettingsBlock", IDS_SETTINGS_SITE_SETTINGS_BLOCK}, 1647 IDS_SETTINGS_SITE_SETTINGS_ALLOWED_RECOMMENDED},
1648 {"siteSettingsSessionOnly", IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY}, 1648 {"siteSettingsBlocked", IDS_SETTINGS_SITE_SETTINGS_BLOCKED},
1649 {"siteSettingsAllowed", IDS_SETTINGS_SITE_SETTINGS_ALLOWED}, 1649 {"siteSettingsBlockedRecommended",
1650 {"siteSettingsAllowedRecommended", 1650 IDS_SETTINGS_SITE_SETTINGS_BLOCKED_RECOMMENDED},
1651 IDS_SETTINGS_SITE_SETTINGS_ALLOWED_RECOMMENDED}, 1651 {"siteSettingsSiteUrl", IDS_SETTINGS_SITE_SETTINGS_SITE_URL},
1652 {"siteSettingsBlocked", IDS_SETTINGS_SITE_SETTINGS_BLOCKED}, 1652 {"siteSettingsActionAllow", IDS_SETTINGS_SITE_SETTINGS_ALLOW_MENU},
1653 {"siteSettingsBlockedRecommended", 1653 {"siteSettingsActionBlock", IDS_SETTINGS_SITE_SETTINGS_BLOCK_MENU},
1654 IDS_SETTINGS_SITE_SETTINGS_BLOCKED_RECOMMENDED}, 1654 {"siteSettingsActionReset", IDS_SETTINGS_SITE_SETTINGS_RESET_MENU},
1655 {"siteSettingsSiteUrl", IDS_SETTINGS_SITE_SETTINGS_SITE_URL}, 1655 {"siteSettingsActionSessionOnly",
1656 {"siteSettingsActionAllow", IDS_SETTINGS_SITE_SETTINGS_ALLOW_MENU}, 1656 IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY_MENU},
1657 {"siteSettingsActionBlock", IDS_SETTINGS_SITE_SETTINGS_BLOCK_MENU}, 1657 {"siteSettingsUsage", IDS_SETTINGS_SITE_SETTINGS_USAGE},
1658 {"siteSettingsActionReset", IDS_SETTINGS_SITE_SETTINGS_RESET_MENU}, 1658 {"siteSettingsPermissions", IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS},
1659 {"siteSettingsActionSessionOnly", 1659 {"siteSettingsClearAndReset", IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON},
1660 IDS_SETTINGS_SITE_SETTINGS_SESSION_ONLY_MENU}, 1660 {"siteSettingsCookieHeader", IDS_SETTINGS_SITE_SETTINGS_COOKIE_HEADER},
1661 {"siteSettingsUsage", IDS_SETTINGS_SITE_SETTINGS_USAGE}, 1661 {"siteSettingsCookieRemove", IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE},
1662 {"siteSettingsPermissions", IDS_SETTINGS_SITE_SETTINGS_PERMISSIONS}, 1662 {"siteSettingsCookieRemoveAll",
1663 {"siteSettingsClearAndReset", IDS_SETTINGS_SITE_SETTINGS_CLEAR_BUTTON}, 1663 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL},
1664 {"siteSettingsCookieHeader", IDS_SETTINGS_SITE_SETTINGS_COOKIE_HEADER}, 1664 {"siteSettingsCookieRemoveAllShown",
1665 {"siteSettingsCookieRemove", IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE}, 1665 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL_SHOWN},
1666 {"siteSettingsCookieRemoveAll", 1666 {"siteSettingsCookieRemoveDialogTitle",
1667 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL}, 1667 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_DIALOG_TITLE},
1668 {"siteSettingsCookieRemoveAllShown", 1668 {"siteSettingsCookieRemoveMultipleConfirmation",
1669 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_ALL_SHOWN}, 1669 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_MULTIPLE},
1670 {"siteSettingsCookieRemoveDialogTitle", 1670 {"siteSettingsCookiesClearAll",
1671 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_DIALOG_TITLE}, 1671 IDS_SETTINGS_SITE_SETTINGS_COOKIES_CLEAR_ALL},
1672 {"siteSettingsCookieRemoveMultipleConfirmation", 1672 {"siteSettingsCookieSearch", IDS_SETTINGS_SITE_SETTINGS_COOKIE_SEARCH},
1673 IDS_SETTINGS_SITE_SETTINGS_COOKIE_REMOVE_MULTIPLE}, 1673 {"siteSettingsCookieSubpage", IDS_SETTINGS_SITE_SETTINGS_COOKIE_SUBPAGE},
1674 {"siteSettingsCookiesClearAll", 1674 {"siteSettingsDelete", IDS_SETTINGS_SITE_SETTINGS_DELETE},
1675 IDS_SETTINGS_SITE_SETTINGS_COOKIES_CLEAR_ALL}, 1675 {"siteSettingsSiteClearAll", IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_ALL},
1676 {"siteSettingsCookieSearch", IDS_SETTINGS_SITE_SETTINGS_COOKIE_SEARCH}, 1676 {"siteSettingsSiteRemoveConfirmation",
1677 {"siteSettingsCookieSubpage", IDS_SETTINGS_SITE_SETTINGS_COOKIE_SUBPAGE}, 1677 IDS_SETTINGS_SITE_SETTINGS_SITE_REMOVE_CONFIRMATION},
1678 {"siteSettingsDelete", IDS_SETTINGS_SITE_SETTINGS_DELETE}, 1678 {"siteSettingsSiteRemoveDialogTitle",
1679 {"siteSettingsSiteClearAll", IDS_SETTINGS_SITE_SETTINGS_SITE_CLEAR_ALL}, 1679 IDS_SETTINGS_SITE_SETTINGS_SITE_REMOVE_DIALOG_TITLE},
1680 {"siteSettingsSiteRemoveConfirmation", 1680 {"thirdPartyCookie", IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE},
1681 IDS_SETTINGS_SITE_SETTINGS_SITE_REMOVE_CONFIRMATION}, 1681 {"thirdPartyCookieSublabel",
1682 {"siteSettingsSiteRemoveDialogTitle", 1682 IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE_SUBLABEL},
1683 IDS_SETTINGS_SITE_SETTINGS_SITE_REMOVE_DIALOG_TITLE}, 1683 {"deleteDataPostSession",
1684 {"thirdPartyCookie", IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE}, 1684 IDS_SETTINGS_SITE_SETTINGS_DELETE_DATA_POST_SESSION},
1685 {"thirdPartyCookieSublabel", 1685 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT},
1686 IDS_SETTINGS_SITE_SETTINGS_THIRD_PARTY_COOKIE_SUBLABEL}, 1686 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT},
1687 {"deleteDataPostSession", 1687 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE},
1688 IDS_SETTINGS_SITE_SETTINGS_DELETE_DATA_POST_SESSION}, 1688 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS},
1689 {"handlerIsDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_IS_DEFAULT}, 1689 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE},
1690 {"handlerSetDefault", IDS_SETTINGS_SITE_SETTINGS_HANDLER_SET_DEFAULT}, 1690 {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO},
1691 {"handlerRemove", IDS_SETTINGS_SITE_SETTINGS_REMOVE}, 1691 {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY},
1692 {"adobeFlashStorage", IDS_SETTINGS_SITE_SETTINGS_ADOBE_FLASH_SETTINGS}, 1692 {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},
1693 {"learnMore", IDS_SETTINGS_SITE_SETTINGS_LEARN_MORE}, 1693 {"siteSettingsSiteDetails", IDS_SETTINGS_SITE_DETAILS},
1694 {"incognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO}, 1694 {"noSitesAdded", IDS_SETTINGS_SITE_NO_SITES_ADDED},
1695 {"incognitoSiteOnly", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_ONLY},
1696 {"embeddedIncognitoSite", IDS_SETTINGS_SITE_SETTINGS_INCOGNITO_EMBEDDED},
1697 {"siteSettingsSiteDetails", IDS_SETTINGS_SITE_DETAILS},
1698 {"noSitesAdded", IDS_SETTINGS_SITE_NO_SITES_ADDED},
1699 }; 1695 };
1700 AddLocalizedStringsBulk(html_source, localized_strings, 1696 AddLocalizedStringsBulk(html_source, localized_strings,
1701 arraysize(localized_strings)); 1697 arraysize(localized_strings));
1702 1698
1703 html_source->AddBoolean("enableSiteSettings", 1699 html_source->AddBoolean("enableSiteSettings",
1704 base::CommandLine::ForCurrentProcess()->HasSwitch( 1700 base::CommandLine::ForCurrentProcess()->HasSwitch(
1705 switches::kEnableSiteSettings)); 1701 switches::kEnableSiteSettings));
1706 1702
1707 if (PluginUtils::ShouldPreferHtmlOverPlugins( 1703 if (PluginUtils::ShouldPreferHtmlOverPlugins(
1708 HostContentSettingsMapFactory::GetForProfile(profile))) { 1704 HostContentSettingsMapFactory::GetForProfile(profile))) {
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 1904
1909 #if defined(OS_CHROMEOS) 1905 #if defined(OS_CHROMEOS)
1910 chromeos::network_element::AddLocalizedStrings(html_source); 1906 chromeos::network_element::AddLocalizedStrings(html_source);
1911 #endif 1907 #endif
1912 policy_indicator::AddLocalizedStrings(html_source); 1908 policy_indicator::AddLocalizedStrings(html_source);
1913 1909
1914 html_source->SetJsonPath(kLocalizedStringsFile); 1910 html_source->SetJsonPath(kLocalizedStringsFile);
1915 } 1911 }
1916 1912
1917 } // namespace settings 1913 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698