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

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: Make windows happy 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 d3c12d2cd5bce0d4c0d654027e564b7f15617315..4b43affb5639cdab694d5de830f83dad8ab5dca3 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
@@ -338,6 +338,8 @@ const ContentSettingsHandler::ExContentSettingsTypeNameEntry
{CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
{CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},
+ {CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER,
+ "register-protocol-handler"},
Evan Stade 2012/06/25 23:31:08 2 more indent
Greg Billock 2012/06/26 19:17:04 Done.
{EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},
};
@@ -652,6 +654,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_REGISTER_PROTOCOL_HANDLER)
Bernhard Bauer 2012/06/25 16:52:20 I think this should be moved into UpdateExceptions
Greg Billock 2012/06/26 19:17:04 This method gets called from InitializePage. Do yo
+ continue;
UpdateExceptionsViewFromModel(ExContentSettingsType(type));
}
}

Powered by Google App Engine
This is Rietveld 408576698