| Index: chrome/browser/ui/extensions/shell_window.h
|
| diff --git a/chrome/browser/ui/extensions/shell_window.h b/chrome/browser/ui/extensions/shell_window.h
|
| index 232f9af68daebce0c0c78852fb6072b39438d73f..2570146f237f1d2699506597b7db719da3f21e6a 100644
|
| --- a/chrome/browser/ui/extensions/shell_window.h
|
| +++ b/chrome/browser/ui/extensions/shell_window.h
|
| @@ -10,7 +10,6 @@
|
| #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;
|
| @@ -19,11 +18,9 @@ class Profile;
|
|
|
| namespace content {
|
| class WebContents;
|
| -class RenderProcessHost;
|
| }
|
|
|
| -class ShellWindow : public content::NotificationObserver,
|
| - public content::WebContentsObserver {
|
| +class ShellWindow : public content::NotificationObserver {
|
| public:
|
| content::WebContents* web_contents() const { return host_->host_contents(); }
|
|
|
| @@ -39,9 +36,6 @@ 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();
|
| @@ -55,12 +49,6 @@ 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);
|
| };
|
|
|
|
|