| Index: chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/options2/content_settings_handler.cc b/chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| index 70aa30a60cda33a32dbd502ce1b1bc5bd86cc80e..a9c073bcf4223e0f43684486338b09d1b491c422 100644
|
| --- a/chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| @@ -343,6 +343,7 @@ const ContentSettingsHandler::ExContentSettingsTypeNameEntry
|
| {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
|
| {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
|
| {CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream"},
|
| + {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"},
|
| };
|
|
|
| ContentSettingsHandler::ContentSettingsHandler() {
|
| @@ -443,6 +444,11 @@ void ContentSettingsHandler::GetLocalizedValues(
|
| { "media-stream_header", IDS_MEDIA_STREAM_HEADER },
|
| { "mediaStreamAsk", IDS_MEDIA_STREAM_ASK_RADIO },
|
| { "mediaStreamBlock", IDS_MEDIA_STREAM_BLOCK_RADIO },
|
| + // PPAPI broker filter.
|
| + { "ppapi_broker_tab_label", IDS_PPAPI_BROKER_TAB_LABEL },
|
| + { "ppapi_broker_allow", IDS_PPAPI_BROKER_ALLOW_RADIO },
|
| + { "ppapi_broker_ask", IDS_PPAPI_BROKER_ASK_RADIO },
|
| + { "ppapi_broker_block", IDS_PPAPI_BROKER_BLOCK_RADIO },
|
| };
|
|
|
| RegisterStrings(localized_strings, resources, arraysize(resources));
|
|
|