Commit c1f0c854 authored by reillyg's avatar reillyg Committed by Commit bot

Use SingleParameterFormatter for settings override permissions.

The search provider, home page and start pages override permission
messages each take a parameter describing the URL that the setting
can be changed to. This was being properly handed in
settings_override_permission.cc but not in the message formatters in
chrome_permission_message_rules.cc.

This change also removes the duplicate rules for these permissions.

BUG=496332

Review URL: https://codereview.chromium.org/1165553008

Cr-Commit-Position: refs/heads/master@{#333119}
parent 42a58c30
...@@ -302,6 +302,9 @@ ChromePermissionMessageRule::GetAllRules() { ...@@ -302,6 +302,9 @@ ChromePermissionMessageRule::GetAllRules() {
IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT), IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_PRODUCT),
{APIPermission::kUsbDeviceUnknownProduct}, {APIPermission::kUsbDeviceUnknownProduct},
{}}, {}},
{IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR,
{APIPermission::kUsbDeviceUnknownVendor},
{}},
{new SimpleListFormatter(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST), {new SimpleListFormatter(IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_LIST),
{APIPermission::kUsbDeviceList}, {APIPermission::kUsbDeviceList},
{}}, {}},
...@@ -535,17 +538,6 @@ ChromePermissionMessageRule::GetAllRules() { ...@@ -535,17 +538,6 @@ ChromePermissionMessageRule::GetAllRules() {
{APIPermission::kInterceptAllKeys}, {APIPermission::kInterceptAllKeys},
{}}, {}},
// Settings override permission messages.
{IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE,
{APIPermission::kHomepage},
{}},
{IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE,
{APIPermission::kSearchProvider},
{}},
{IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE,
{APIPermission::kStartupPages},
{}},
{IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE, {IDS_EXTENSION_PROMPT_WARNING_AUDIO_AND_VIDEO_CAPTURE,
{APIPermission::kAudioCapture, APIPermission::kVideoCapture}, {APIPermission::kAudioCapture, APIPermission::kVideoCapture},
{}}, {}},
...@@ -595,19 +587,17 @@ ChromePermissionMessageRule::GetAllRules() { ...@@ -595,19 +587,17 @@ ChromePermissionMessageRule::GetAllRules() {
// API permission rules: // API permission rules:
// SettingsOverrideAPIPermission: // SettingsOverrideAPIPermission:
{IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE, {new SingleParameterFormatter(
IDS_EXTENSION_PROMPT_WARNING_HOME_PAGE_SETTING_OVERRIDE),
{APIPermission::kHomepage}, {APIPermission::kHomepage},
{}}, {}},
{IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE, {new SingleParameterFormatter(
{APIPermission::kStartupPages}, IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE),
{}},
{IDS_EXTENSION_PROMPT_WARNING_SEARCH_SETTINGS_OVERRIDE,
{APIPermission::kSearchProvider}, {APIPermission::kSearchProvider},
{}}, {}},
{new SingleParameterFormatter(
// USBDevicePermission: IDS_EXTENSION_PROMPT_WARNING_START_PAGE_SETTING_OVERRIDE),
{IDS_EXTENSION_PROMPT_WARNING_USB_DEVICE_UNKNOWN_VENDOR, {APIPermission::kStartupPages},
{APIPermission::kUsbDeviceUnknownVendor},
{}}, {}},
// Other rules: // Other rules:
......
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