Add the names of plugins to the blocked plugin bubble.

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
@@ skipping 156 matching lines @@
 
   // Returns true if content blockage was indicated to the user.
   bool IsBlockageIndicated(ContentSettingsType content_type) const;
 
   void SetBlockageHasBeenIndicated(ContentSettingsType content_type);
 
   // Returns whether a particular kind of content has been allowed. Currently
   // only tracks cookies.
   bool IsContentAllowed(ContentSettingsType content_type) const;
 
+  // Stores the names of plugins that have been blocked for this tab.
+  const base::string16 blocked_plugin_names() const;

[Lei Zhang, 2014/12/05 22:18:05]

Non-trivial methods should be NamedLikeThis().

[Will Harris, 2014/12/08 00:21:11]

Done.

+
   const GURL& media_stream_access_origin() const {
     return media_stream_access_origin_;
   }
 
   const std::string& media_stream_requested_audio_device() const {
     return media_stream_requested_audio_device_;
   }
 
   const std::string& media_stream_requested_video_device() const {
     return media_stream_requested_video_device_;
@@ skipping 89 matching lines @@
     load_plugins_link_enabled_ = enabled;
   }
 
   // Called to indicate whether access to the Pepper broker was allowed or
   // blocked.
   void SetPepperBrokerAllowed(bool allowed);
 
   // Message handlers.
   // TODO(vabr): Only public for tests. Move to a test client.
   void OnContentBlocked(ContentSettingsType type);
+  void OnContentBlockedWithDetail(ContentSettingsType type,
+                                  const base::string16& details);
   void OnContentAllowed(ContentSettingsType type);
 
   // These methods are invoked on the UI thread by the static functions above.
   // TODO(vabr): Only public for tests. Move to a test client.
   void OnCookiesRead(const GURL& url,
                      const GURL& first_party_url,
                      const net::CookieList& cookie_list,
                      bool blocked_by_policy);
   void OnCookieChanged(const GURL& url,
                        const GURL& first_party_url,
@@ skipping 113 matching lines @@
 
   // The previous protocol handler to be replaced by
   // the pending_protocol_handler_, if there is one. Empty if
   // there is no handler which would be replaced.
   ProtocolHandler previous_protocol_handler_;
 
   // The setting on the pending protocol handler registration. Persisted in case
   // the user opens the bubble and makes changes multiple times.
   ContentSetting pending_protocol_handler_setting_;
 
+  // The name(s) of the plugin(s) being blocked.
+  base::hash_set<base::string16> blocked_plugin_names_;
+
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   // The origin of the media stream request. Note that we only support handling
   // settings for one request per tab. The latest request's origin will be
   // stored here. http://crbug.com/259794
   GURL media_stream_access_origin_;
 
   // The microphone and camera state at the last media stream request.
   MicrophoneCameraState microphone_camera_state_;
   // The selected devices at the last media stream request.
   std::string media_stream_selected_audio_device_;
   std::string media_stream_selected_video_device_;
 
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_