Bring up a content settings icon for ungestured registerProtocolHandler call.

chrome/browser/ui/webui/options2/content_settings_handler2.cc

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 3285aeda7d7f63af7fa980eeec53fa2388036d03..54bca41bf1790a7fdffcd4938f04a9234875e4be 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
@@ -338,6 +338,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"},
 };
@@ -660,6 +661,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));
   }
 }
@@ -690,6 +694,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:

[Peter Kasting, 2012/06/26 19:53:00]

Did you mean to include this?

[Greg Billock, 2012/06/26 20:31:41]

Yes. This is the one you thought should to be included here as well as in
UpdateAllExceptionsViewsFromModel. I think you're right that if they're in
UpdateAll* they should be in Update* -- UpdateAll* calls this method, but other
parts of the system must as well. 

+      break;
+    case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
+      break;
     default:
       UpdateExceptionsViewFromHostContentSettingsMap(
           type.ToContentSettingsType());