| Index: extensions/browser/app_window/app_window_contents.h
|
| diff --git a/extensions/browser/app_window/app_window_contents.h b/extensions/browser/app_window/app_window_contents.h
|
| index ab07ca6a369ae6541971d0ed5e232daa33872e79..56c1664747369dcab562726ac1dc0c6787ad1aa9 100644
|
| --- a/extensions/browser/app_window/app_window_contents.h
|
| +++ b/extensions/browser/app_window/app_window_contents.h
|
| @@ -10,7 +10,6 @@
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "extensions/browser/app_window/app_window.h"
|
| -#include "extensions/browser/extension_function_dispatcher.h"
|
| #include "url/gurl.h"
|
|
|
| namespace content {
|
| @@ -25,8 +24,7 @@ struct DraggableRegion;
|
| // WebContents instance and observes it for the purpose of passing
|
| // messages to the extensions system.
|
| class AppWindowContentsImpl : public AppWindowContents,
|
| - public content::WebContentsObserver,
|
| - public ExtensionFunctionDispatcher::Delegate {
|
| + public content::WebContentsObserver {
|
| public:
|
| explicit AppWindowContentsImpl(AppWindow* host);
|
| ~AppWindowContentsImpl() override;
|
| @@ -38,23 +36,18 @@ class AppWindowContentsImpl : public AppWindowContents,
|
| void NativeWindowClosed() override;
|
| void DispatchWindowShownForTests() const override;
|
| content::WebContents* GetWebContents() const override;
|
| + WindowController* GetWindowController() const override;
|
|
|
| private:
|
| // content::WebContentsObserver
|
| bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| - // ExtensionFunctionDispatcher::Delegate
|
| - WindowController* GetExtensionWindowController() const override;
|
| - content::WebContents* GetAssociatedWebContents() const override;
|
| -
|
| - void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
| void UpdateDraggableRegions(const std::vector<DraggableRegion>& regions);
|
| void SuspendRenderViewHost(content::RenderViewHost* rvh);
|
|
|
| AppWindow* host_; // This class is owned by |host_|
|
| GURL url_;
|
| scoped_ptr<content::WebContents> web_contents_;
|
| - scoped_ptr<ExtensionFunctionDispatcher> extension_function_dispatcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(AppWindowContentsImpl);
|
| };
|
|
|