Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4610)

Unified Diff: chrome/browser/ui/webui/options2/content_settings_handler2.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Repair merge to head Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());

Powered by Google App Engine
This is Rietveld 408576698