Skip to content

GitLab

T
tangled
Commit 3fa7c6e4 authored by harrisonsean's avatar harrisonsean Committed by Chromium LUCI CQ
Browse files
Options

WebUI Settings: site settings page strings 

Redesigned site settings page enabled/disabled strings.

Bug: 1113642
Change-Id: I4b16629fdf0997fae00d0b5bfc9a541330de902a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461013
Commit-Queue: Sean Harrison <harrisonsean@chromium.org>
Reviewed-by: default avatarSean Harrison <harrisonsean@chromium.org>
Reviewed-by: default avatarTheodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#844729}
parent b09736c3
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 38 deletions
chrome/browser/resources/settings/site_settings_page/site_settings_page.js
View file @ 3fa7c6e4
...@@ -41,6 +41,8 @@ function getCategoryItemMap() { ...@@ -41,6 +41,8 @@ function getCategoryItemMap() {
return categoryItemMap; return categoryItemMap;
} }
const redesignEnabled =
loadTimeData.getBoolean('enableContentSettingsRedesign');
// The following list is ordered alphabetically by |id|. The order in which // The following list is ordered alphabetically by |id|. The order in which
// these appear in the UI is determined elsewhere in this file. // these appear in the UI is determined elsewhere in this file.
const categoryList = [ const categoryList = [
...@@ -49,8 +51,10 @@ function getCategoryItemMap() { ...@@ -49,8 +51,10 @@ function getCategoryItemMap() {
id: Id.ADS, id: Id.ADS,
label: 'siteSettingsAds', label: 'siteSettingsAds',
icon: 'settings:ads', icon: 'settings:ads',
enabledLabel: 'siteSettingsAllowed', enabledLabel: redesignEnabled ? 'siteSettingsAdsAllowed' :
disabledLabel: 'siteSettingsAdsBlock', 'siteSettingsAllowed',
disabledLabel: redesignEnabled ? 'siteSettingsAdsBlocked' :
'siteSettingsAdsBlock',
shouldShow: () => shouldShow: () =>
loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'), loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter'),
}, },
...@@ -59,24 +63,30 @@ function getCategoryItemMap() { ...@@ -59,24 +63,30 @@ function getCategoryItemMap() {
id: Id.AR, id: Id.AR,
label: 'siteSettingsAr', label: 'siteSettingsAr',
icon: 'settings:vr-headset', icon: 'settings:vr-headset',
enabledLabel: 'siteSettingsArAsk', enabledLabel: redesignEnabled ? 'siteSettingsArAllowed' :
disabledLabel: 'siteSettingsArBlock', 'siteSettingsArAsk',
disabledLabel: redesignEnabled ? 'siteSettingsArBlocked' :
'siteSettingsArBlock',
}, },
{ {
route: routes.SITE_SETTINGS_AUTOMATIC_DOWNLOADS, route: routes.SITE_SETTINGS_AUTOMATIC_DOWNLOADS,
id: Id.AUTOMATIC_DOWNLOADS, id: Id.AUTOMATIC_DOWNLOADS,
label: 'siteSettingsAutomaticDownloads', label: 'siteSettingsAutomaticDownloads',
icon: 'cr:file-download', icon: 'cr:file-download',
enabledLabel: 'siteSettingsAutoDownloadAsk', enabledLabel: redesignEnabled ? 'siteSettingsAutomaticDownloadsAllowed' :
disabledLabel: 'siteSettingsAutoDownloadBlock', 'siteSettingsAutoDownloadAsk',
disabledLabel: redesignEnabled ? 'siteSettingsAutomaticDownloadsBlocked' :
'siteSettingsAutoDownloadBlock',
}, },
{ {
route: routes.SITE_SETTINGS_BACKGROUND_SYNC, route: routes.SITE_SETTINGS_BACKGROUND_SYNC,
id: Id.BACKGROUND_SYNC, id: Id.BACKGROUND_SYNC,
label: 'siteSettingsBackgroundSync', label: 'siteSettingsBackgroundSync',
icon: 'cr:sync', icon: 'cr:sync',
enabledLabel: 'siteSettingsAllowRecentlyClosedSites', enabledLabel: redesignEnabled ? 'siteSettingsBackgroundSyncAllowed' :
disabledLabel: 'siteSettingsBackgroundSyncBlocked', 'siteSettingsAllowRecentlyClosedSites',
disabledLabel: redesignEnabled ? 'siteSettingsBackgroundSyncBlocked' :
'siteSettingsBackgroundSyncBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_BLUETOOTH_DEVICES, route: routes.SITE_SETTINGS_BLUETOOTH_DEVICES,
...@@ -103,16 +113,20 @@ function getCategoryItemMap() { ...@@ -103,16 +113,20 @@ function getCategoryItemMap() {
id: Id.CAMERA, id: Id.CAMERA,
label: 'siteSettingsCamera', label: 'siteSettingsCamera',
icon: 'cr:videocam', icon: 'cr:videocam',
enabledLabel: 'siteSettingsAskBeforeAccessing', enabledLabel: redesignEnabled ? 'siteSettingsCameraAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAskBeforeAccessing',
disabledLabel: redesignEnabled ? 'siteSettingsCameraBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_CLIPBOARD, route: routes.SITE_SETTINGS_CLIPBOARD,
id: Id.CLIPBOARD, id: Id.CLIPBOARD,
label: 'siteSettingsClipboard', label: 'siteSettingsClipboard',
icon: 'settings:clipboard', icon: 'settings:clipboard',
enabledLabel: 'siteSettingsAskBeforeAccessing', enabledLabel: redesignEnabled ? 'siteSettingsClipboardAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAskBeforeAccessing',
disabledLabel: redesignEnabled ? 'siteSettingsClipboardBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.COOKIES, route: routes.COOKIES,
...@@ -128,8 +142,10 @@ function getCategoryItemMap() { ...@@ -128,8 +142,10 @@ function getCategoryItemMap() {
id: Id.GEOLOCATION, id: Id.GEOLOCATION,
label: 'siteSettingsLocation', label: 'siteSettingsLocation',
icon: 'cr:location-on', icon: 'cr:location-on',
enabledLabel: 'siteSettingsAskBeforeAccessing', enabledLabel: redesignEnabled ? 'siteSettingsLocationAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAskBeforeAccessing',
disabledLabel: redesignEnabled ? 'siteSettingsLocationBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_HID_DEVICES, route: routes.SITE_SETTINGS_HID_DEVICES,
...@@ -152,32 +168,40 @@ function getCategoryItemMap() { ...@@ -152,32 +168,40 @@ function getCategoryItemMap() {
id: Id.IMAGES, id: Id.IMAGES,
label: 'siteSettingsImages', label: 'siteSettingsImages',
icon: 'settings:photo', icon: 'settings:photo',
enabledLabel: 'siteSettingsShowAll', enabledLabel: redesignEnabled ? 'siteSettingsImagesAllowed' :
disabledLabel: 'siteSettingsDontShowImages', 'siteSettingsShowAll',
disabledLabel: redesignEnabled ? 'siteSettingsImagesBlocked' :
'siteSettingsDontShowImages',
}, },
{ {
route: routes.SITE_SETTINGS_JAVASCRIPT, route: routes.SITE_SETTINGS_JAVASCRIPT,
id: Id.JAVASCRIPT, id: Id.JAVASCRIPT,
label: 'siteSettingsJavascript', label: 'siteSettingsJavascript',
icon: 'settings:code', icon: 'settings:code',
enabledLabel: 'siteSettingsAllowed', enabledLabel: redesignEnabled ? 'siteSettingsJavascriptAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAllowed',
disabledLabel: redesignEnabled ? 'siteSettingsJavascriptBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_MICROPHONE, route: routes.SITE_SETTINGS_MICROPHONE,
id: Id.MIC, id: Id.MIC,
label: 'siteSettingsMic', label: 'siteSettingsMic',
icon: 'cr:mic', icon: 'cr:mic',
enabledLabel: 'siteSettingsAskBeforeAccessing', enabledLabel: redesignEnabled ? 'siteSettingsMicAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAskBeforeAccessing',
disabledLabel: redesignEnabled ? 'siteSettingsMicBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_MIDI_DEVICES, route: routes.SITE_SETTINGS_MIDI_DEVICES,
id: Id.MIDI_DEVICES, id: Id.MIDI_DEVICES,
label: 'siteSettingsMidiDevices', label: 'siteSettingsMidiDevices',
icon: 'settings:midi', icon: 'settings:midi',
enabledLabel: 'siteSettingsMidiDevicesAsk', enabledLabel: redesignEnabled ? 'siteSettingsMidiAllowed' :
disabledLabel: 'siteSettingsMidiDevicesBlock', 'siteSettingsMidiDevicesAsk',
disabledLabel: redesignEnabled ? 'siteSettingsMidiBlocked' :
'siteSettingsMidiDevicesBlock',
}, },
{ {
route: routes.SITE_SETTINGS_MIXEDSCRIPT, route: routes.SITE_SETTINGS_MIXEDSCRIPT,
...@@ -191,8 +215,10 @@ function getCategoryItemMap() { ...@@ -191,8 +215,10 @@ function getCategoryItemMap() {
id: Id.FILE_SYSTEM_WRITE, id: Id.FILE_SYSTEM_WRITE,
label: 'siteSettingsFileSystemWrite', label: 'siteSettingsFileSystemWrite',
icon: 'settings:save-original', icon: 'settings:save-original',
enabledLabel: 'siteSettingsFileSystemWriteAsk', enabledLabel: redesignEnabled ? 'siteSettingsFileSystemWriteAllowed' :
disabledLabel: 'siteSettingsFileSystemWriteBlock', 'siteSettingsFileSystemWriteAsk',
disabledLabel: redesignEnabled ? 'siteSettingsFileSystemWriteBlocked' :
'siteSettingsFileSystemWriteBlock',
}, },
{ {
route: routes.SITE_SETTINGS_FONT_ACCESS, route: routes.SITE_SETTINGS_FONT_ACCESS,
...@@ -217,8 +243,10 @@ function getCategoryItemMap() { ...@@ -217,8 +243,10 @@ function getCategoryItemMap() {
id: Id.PAYMENT_HANDLER, id: Id.PAYMENT_HANDLER,
label: 'siteSettingsPaymentHandler', label: 'siteSettingsPaymentHandler',
icon: 'settings:payment-handler', icon: 'settings:payment-handler',
enabledLabel: 'siteSettingsPaymentHandlerAllow', enabledLabel: redesignEnabled ? 'siteSettingsPaymentHandlersAllowed' :
disabledLabel: 'siteSettingsPaymentHandlerBlock', 'siteSettingsPaymentHandlerAllow',
disabledLabel: redesignEnabled ? 'siteSettingsPaymentHandlersBlocked' :
'siteSettingsPaymentHandlerBlock',
shouldShow: () => shouldShow: () =>
loadTimeData.getBoolean('enablePaymentHandlerContentSetting'), loadTimeData.getBoolean('enablePaymentHandlerContentSetting'),
}, },
...@@ -233,8 +261,10 @@ function getCategoryItemMap() { ...@@ -233,8 +261,10 @@ function getCategoryItemMap() {
id: Id.POPUPS, id: Id.POPUPS,
label: 'siteSettingsPopups', label: 'siteSettingsPopups',
icon: 'cr:open-in-new', icon: 'cr:open-in-new',
enabledLabel: 'siteSettingsAllowed', enabledLabel: redesignEnabled ? 'siteSettingsPopupsAllowed' :
disabledLabel: 'siteSettingsBlocked', 'siteSettingsAllowed',
disabledLabel: redesignEnabled ? 'siteSettingsPopupsBlocked' :
'siteSettingsBlocked',
}, },
{ {
route: routes.SITE_SETTINGS_PROTECTED_CONTENT, route: routes.SITE_SETTINGS_PROTECTED_CONTENT,
...@@ -256,40 +286,50 @@ function getCategoryItemMap() { ...@@ -256,40 +286,50 @@ function getCategoryItemMap() {
id: Id.SENSORS, id: Id.SENSORS,
label: 'siteSettingsSensors', label: 'siteSettingsSensors',
icon: 'settings:sensors', icon: 'settings:sensors',
enabledLabel: 'siteSettingsSensorsAllow', enabledLabel: redesignEnabled ? 'siteSettingsMotionSensorsAllowed' :
disabledLabel: 'siteSettingsSensorsBlock', 'siteSettingsSensorsAllow',
disabledLabel: redesignEnabled ? 'siteSettingsMotionSensorsBlocked' :
'siteSettingsSensorsBlock',
}, },
{ {
route: routes.SITE_SETTINGS_SERIAL_PORTS, route: routes.SITE_SETTINGS_SERIAL_PORTS,
id: Id.SERIAL_PORTS, id: Id.SERIAL_PORTS,
label: 'siteSettingsSerialPorts', label: 'siteSettingsSerialPorts',
icon: 'settings:serial-port', icon: 'settings:serial-port',
enabledLabel: 'siteSettingsSerialPortsAsk', enabledLabel: redesignEnabled ? 'siteSettingsSerialPortsAllowed' :
disabledLabel: 'siteSettingsSerialPortsBlock', 'siteSettingsSerialPortsAsk',
disabledLabel: redesignEnabled ? 'siteSettingsSerialPortsBlocked' :
'siteSettingsSerialPortsBlock',
}, },
{ {
route: routes.SITE_SETTINGS_SOUND, route: routes.SITE_SETTINGS_SOUND,
id: Id.SOUND, id: Id.SOUND,
label: 'siteSettingsSound', label: 'siteSettingsSound',
icon: 'settings:volume-up', icon: 'settings:volume-up',
enabledLabel: 'siteSettingsSoundAllow', enabledLabel: redesignEnabled ? 'siteSettingsSoundAllowed' :
disabledLabel: 'siteSettingsSoundBlock', 'siteSettingsSoundAllow',
disabledLabel: redesignEnabled ? 'siteSettingsSoundBlocked' :
'siteSettingsSoundBlock',
}, },
{ {
route: routes.SITE_SETTINGS_USB_DEVICES, route: routes.SITE_SETTINGS_USB_DEVICES,
id: Id.USB_DEVICES, id: Id.USB_DEVICES,
label: 'siteSettingsUsbDevices', label: 'siteSettingsUsbDevices',
icon: 'settings:usb', icon: 'settings:usb',
enabledLabel: 'siteSettingsUsbDevicesAsk', enabledLabel: redesignEnabled ? 'siteSettingsUsbAllowed' :
disabledLabel: 'siteSettingsUsbDevicesBlock', 'siteSettingsUsbDevicesAsk',
disabledLabel: redesignEnabled ? 'siteSettingsUsbBlocked' :
'siteSettingsUsbDevicesBlock',
}, },
{ {
route: routes.SITE_SETTINGS_VR, route: routes.SITE_SETTINGS_VR,
id: Id.VR, id: Id.VR,
label: 'siteSettingsVr', label: 'siteSettingsVr',
icon: 'settings:vr-headset', icon: 'settings:vr-headset',
enabledLabel: 'siteSettingsVrAsk', enabledLabel: redesignEnabled ? 'siteSettingsVrAllowed' :
disabledLabel: 'siteSettingsVrBlock', 'siteSettingsVrAsk',
disabledLabel: redesignEnabled ? 'siteSettingsVrBlocked' :
'siteSettingsVrBlock',
}, },
{ {
route: routes.SITE_SETTINGS_WINDOW_PLACEMENT, route: routes.SITE_SETTINGS_WINDOW_PLACEMENT,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment