Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing

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 94 matching lines @@
     {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},
     {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE},
   };
   static const ContentSettingsTypeIdEntry kBlockedExplanatoryTextIDs[] = {
     {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT},
+    {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT},
     {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
-        IDS_BLOCKED_DOWNLOADS_EXPLANATION},
+          IDS_BLOCKED_DOWNLOADS_EXPLANATION},
   };
 
   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 (get_content_settings_type() == CONTENT_SETTINGS_TYPE_PLUGINS &&
+      (profile->GetHostContentSettingsMap()->
+        GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS, NULL) !=
+        CONTENT_SETTING_ALLOW))
+    explanation_id = 0;
+
+
   if (!content_settings->IsContentBlocked(get_content_settings_type())) {
     if (!content_settings->IsContentAllowed(get_content_settings_type()))
       return;
 
     // For cookies, only show the accessed bubble if cookies are blocked by
     // default.
     if (get_content_settings_type() == CONTENT_SETTINGS_TYPE_COOKIES &&
         (profile->GetHostContentSettingsMap()->
             GetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES, NULL) !=
                 CONTENT_SETTING_BLOCK))
@@ skipping 211 matching lines @@
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
       return new ContentSettingMediaImageModel(content_settings_type);
     case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
       return new ContentSettingMIDISysExImageModel();
     default:
       return new ContentSettingBlockedImageModel(content_settings_type);
   }
 }