diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 08:22:21 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-03 08:22:21 +0000 |
| commit | 97c5c596e4b649651fbef56875e125c06acb0f90 (patch) | |
| tree | 3acba85143369eacd72006d383e5e198a59f9c7a /chrome/renderer/blocked_plugin.h | |
| parent | 7a13e7926699ad5d03f2d6e121b7bdb68ca05680 (diff) | |
| download | chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.zip chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.tar.gz chromium_src-97c5c596e4b649651fbef56875e125c06acb0f90.tar.bz2 | |
Add "Load all plugins on this page" button to blocked plugins bubble if click-to-play is enabled.
Screenshot: http://imgur.com/ZKsQB.png
XIB changes: Add a rounded rect button hooked up to |loadAllPlugins:| in the File's Owner and referenced by its |loadAllPluginsButton_| outlet, wrapped in a GTMWidthBasedTweaker.
BUG=49677
TEST=ContentSettingBubbleModelTest.*
Review URL: http://codereview.chromium.org/3015036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/blocked_plugin.h')
| -rw-r--r-- | chrome/renderer/blocked_plugin.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h index 2e7bd75..014c489 100644 --- a/chrome/renderer/blocked_plugin.h +++ b/chrome/renderer/blocked_plugin.h @@ -6,6 +6,7 @@ #define CHROME_RENDERER_BLOCKED_PLUGIN_H_ #pragma once +#include "chrome/common/notification_registrar.h" #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h" #include "webkit/glue/cpp_bound_class.h" #include "webkit/glue/plugins/webview_plugin.h" @@ -13,7 +14,8 @@ class RenderView; class BlockedPlugin : public CppBoundClass, - public WebViewPlugin::Delegate { + public WebViewPlugin::Delegate, + public NotificationObserver { public: BlockedPlugin(RenderView* render_view, WebKit::WebFrame* frame, @@ -28,6 +30,11 @@ class BlockedPlugin : public CppBoundClass, virtual void BindWebFrame(WebKit::WebFrame* frame); virtual void WillDestroyPlugin(); + // NotificationObserver methods: + virtual void Observe(NotificationType type, + const NotificationSource& source, + const NotificationDetails& details); + private: virtual ~BlockedPlugin() { } @@ -35,6 +42,8 @@ class BlockedPlugin : public CppBoundClass, WebKit::WebFrame* frame_; WebKit::WebPluginParams plugin_params_; WebViewPlugin* plugin_; + + NotificationRegistrar registrar_; }; #endif // CHROME_RENDERER_BLOCKED_PLUGIN_H_ |