Revert 120541 - Block plugins for platform apps

To block plugins a new content settings has been
added, with the highest priority (i.e. at the front of
the list). This could be used down the track to hang
off more platform app specific stuff.

The provider knows which platform apps have been run
by watching a new notification.

BUG=None
TEST=Tested manually on Windows


Review URL: http://codereview.chromium.org/9169042

TBR=benwells@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9316124

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120542 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 1 deletions

diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
index 2570146..232f9af 100644
--- a/chrome/browser/ui/extensions/shell_window.h
+++ b/chrome/browser/ui/extensions/shell_window.h
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/web_contents_observer.h"
 
 class GURL;
 class Extension;
@@ -18,9 +19,11 @@ class Profile;
 
 namespace content {
 class WebContents;
+class RenderProcessHost;
 }
 
-class ShellWindow : public content::NotificationObserver {
+class ShellWindow : public content::NotificationObserver,
+                    public content::WebContentsObserver {
  public:
   content::WebContents* web_contents() const { return host_->host_contents(); }
 
@@ -36,6 +39,9 @@ class ShellWindow : public content::NotificationObserver {
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // content::WebContentsObserver
+  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
+
  protected:
   explicit ShellWindow(ExtensionHost* host_);
   virtual ~ShellWindow();
@@ -49,6 +55,12 @@ class ShellWindow : public content::NotificationObserver {
   content::NotificationRegistrar registrar_;
 
  private:
+  // Disable NPAPI plugins for this shell window.
+  void DisableNPAPIPlugins();
+
+  // Clear information about disabled NPAPI plugins for this shell window.
+  void ClearDisabledNPAPIPlugins();
+
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };