summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/blocked_plugin.cc
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 08:22:21 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 08:22:21 +0000
commit97c5c596e4b649651fbef56875e125c06acb0f90 (patch)
tree3acba85143369eacd72006d383e5e198a59f9c7a /chrome/renderer/blocked_plugin.cc
parent7a13e7926699ad5d03f2d6e121b7bdb68ca05680 (diff)
downloadchromium_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.cc')
-rw-r--r--chrome/renderer/blocked_plugin.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc
index 3e891b3..a6ef499 100644
--- a/chrome/renderer/blocked_plugin.cc
+++ b/chrome/renderer/blocked_plugin.cc
@@ -9,6 +9,7 @@
#include "base/file_path.h"
#include "base/string_piece.h"
#include "chrome/common/jstemplate_builder.h"
+#include "chrome/common/notification_service.h"
#include "chrome/renderer/render_view.h"
#include "grit/generated_resources.h"
#include "grit/renderer_resources.h"
@@ -57,6 +58,10 @@ BlockedPlugin::BlockedPlugin(RenderView* render_view,
web_view->mainFrame()->loadHTMLString(htmlData,
GURL(kBlockedPluginDataURL));
+
+ registrar_.Add(this,
+ NotificationType::SHOULD_LOAD_PLUGINS,
+ NotificationService::AllSources());
}
void BlockedPlugin::BindWebFrame(WebFrame* frame) {
@@ -68,6 +73,16 @@ void BlockedPlugin::WillDestroyPlugin() {
delete this;
}
+void BlockedPlugin::Observe(NotificationType type,
+ const NotificationSource& source,
+ const NotificationDetails& details) {
+ if (type == NotificationType::SHOULD_LOAD_PLUGINS) {
+ LoadPlugin();
+ } else {
+ NOTREACHED();
+ }
+}
+
void BlockedPlugin::Load(const CppArgumentList& args, CppVariant* result) {
LoadPlugin();
}