Add content settings page action for Pepper broker authorization.

chrome/browser/ui/content_settings/content_setting_image_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 63 matching lines @@
   if (!web_contents)
     return;
 
   static const ContentSettingsTypeIdEntry kBlockedIconIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDR_BLOCKED_COOKIES},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDR_BLOCKED_IMAGES},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDR_BLOCKED_JAVASCRIPT},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDR_BLOCKED_PLUGINS},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDR_BLOCKED_POPUPS},
     {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDR_BLOCKED_MIXED_CONTENT},
+    {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDR_BLOCKED_PPAPI_BROKER},
   };
   static const ContentSettingsTypeIdEntry kBlockedTooltipIDs[] = {
     {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},
     {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE},
     {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE},
     {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE},
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TOOLTIP},
     {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
         IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT},
+    {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_TITLE},
   };
   static const ContentSettingsTypeIdEntry kBlockedExplanatoryTextIDs[] = {
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT},
   };
 
   ContentSettingsType type = get_content_settings_type();
   int icon_id = GetIdForContentType(
       kBlockedIconIDs, arraysize(kBlockedIconIDs), type);
   int tooltip_id = GetIdForContentType(
       kBlockedTooltipIDs, arraysize(kBlockedTooltipIDs), type);
   int explanation_id = GetIdForContentType(
       kBlockedExplanatoryTextIDs, arraysize(kBlockedExplanatoryTextIDs), type);
 
   // If a content type is blocked by default and was accessed, display the
   // accessed icon.
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (!content_settings)
     return;
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   if (!content_settings->IsContentBlocked(get_content_settings_type())) {
-    if (!content_settings->IsContentAccessed(get_content_settings_type()) ||
+    if (!content_settings->IsContentAccessed(get_content_settings_type()))
+      return;
+
+    // For cookies, only show the accessed bubble if cookies are blocked by

[markusheintz_, 2012/12/17 16:03:59]

This Change seems not to be related to the issue. Why is this in this CL?

What about if cookies are block due to an exception? Don't we display an page
action icon then?

[Bernhard Bauer, 2012/12/17 16:41:31]

This behavior (for cookies at least) has been in Chrome for some time, I just
added a comment after I spent a while figuring out why we do it (there used to
be a comment, but it got lost in a refactoring). The only functional change is
that I added the check for CONTENT_SETTINGS_TYPE_COOKIES because now we have
other content types for which we show an "accessed" bubble.
We do (as we do for every time cookies are blocked on a page, by default or via
an exception), but this branch is for when cookies are allowed on a page, to
keep the icon from showing up all the time when the content settings are at
default values.

+    // default.
+    if (get_content_settings_type() == CONTENT_SETTINGS_TYPE_COOKIES &&
         (profile->GetHostContentSettingsMap()->
-            GetDefaultContentSetting(get_content_settings_type(), NULL) !=
+            GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, NULL) !=
                 CONTENT_SETTING_BLOCK))
       return;
+
     static const ContentSettingsTypeIdEntry kAccessedIconIDs[] = {
       {CONTENT_SETTINGS_TYPE_COOKIES, IDR_ACCESSED_COOKIES},
+      {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDR_BLOCKED_PPAPI_BROKER},
     };
     static const ContentSettingsTypeIdEntry kAccessedTooltipIDs[] = {
       {CONTENT_SETTINGS_TYPE_COOKIES, IDS_ACCESSED_COOKIES_TITLE},
+      {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_TITLE},
     };
     icon_id = GetIdForContentType(
         kAccessedIconIDs, arraysize(kAccessedIconIDs), type);
     tooltip_id = GetIdForContentType(
         kAccessedTooltipIDs, arraysize(kAccessedTooltipIDs), type);
     explanation_id = 0;
   }
   set_visible(true);
+  DCHECK(icon_id);
   set_icon(icon_id);
   set_explanatory_string_id(explanation_id);
+  DCHECK(tooltip_id);
   set_tooltip(l10n_util::GetStringUTF8(tooltip_id));
 }
 
 ContentSettingGeolocationImageModel::ContentSettingGeolocationImageModel()
     : ContentSettingImageModel(CONTENT_SETTINGS_TYPE_GEOLOCATION) {
 }
 
 void ContentSettingGeolocationImageModel::UpdateFromWebContents(
     WebContents* web_contents) {
   set_visible(false);
@@ skipping 70 matching lines @@
     case CONTENT_SETTINGS_TYPE_GEOLOCATION:
       return new ContentSettingGeolocationImageModel();
     case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
       return new ContentSettingNotificationsImageModel();
     case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:
       return new ContentSettingRPHImageModel();
     default:
       return new ContentSettingBlockedImageModel(content_settings_type);
   }
 }