| 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 ab2b6a1c02b3fb96a8f6988a2ab6a28cc71f47fc..70aa30a60cda33a32dbd502ce1b1bc5bd86cc80e 100644
|
| --- a/chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/options2/content_settings_handler.cc
|
| @@ -340,6 +340,7 @@ const ContentSettingsHandler::ExContentSettingsTypeNameEntry
|
| {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
|
| {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
|
| {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},
|
| + {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
|
| {EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
|
| {CONTENT_SETTINGS_TYPE_MEDIASTREAM, "media-stream"},
|
| };
|
| @@ -657,6 +658,9 @@ void ContentSettingsHandler::UpdateAllExceptionsViewsFromModel() {
|
| // for this content type and we skip it here.
|
| if (type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE)
|
| continue;
|
| + // The RPH settings are retrieved separately.
|
| + if (type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)
|
| + continue;
|
| UpdateExceptionsViewFromModel(ExContentSettingsType(type));
|
| }
|
| }
|
| @@ -687,6 +691,10 @@ void ContentSettingsHandler::UpdateExceptionsViewFromModel(
|
| case CONTENT_SETTINGS_TYPE_MIXEDSCRIPT:
|
| // We don't yet support exceptions for mixed scripting.
|
| break;
|
| + case CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE:
|
| + break;
|
| + case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
|
| + break;
|
| default:
|
| UpdateExceptionsViewFromHostContentSettingsMap(
|
| type.ToContentSettingsType());
|
|
|