| Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| index 30c26118b7e870f3e385629d09b42a1616d9083b..359db7a826d7d4a5c034ad012d62ca39ed20f56d 100644
|
| --- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
|
| @@ -339,6 +339,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"},
|
| };
|
| @@ -661,6 +662,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));
|
| }
|
| }
|
| @@ -691,6 +695,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());
|
|
|