| Index: chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.h b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| index 9c11365f50bedc5923fe6df3e594ba2c49668a2b..bedb4ae55657b41da95c8faf85202f45f9ef355b 100644
|
| --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.h
|
| @@ -10,9 +10,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
|
| -#include "content/public/browser/web_contents_observer.h"
|
| #include "extensions/browser/app_window/app_window.h"
|
| -#include "extensions/browser/extension_function_dispatcher.h"
|
|
|
| class AshPanelWindowController;
|
| class GURL;
|
| @@ -32,9 +30,7 @@ struct DraggableRegion;
|
| // extensions API.
|
| class AshPanelContents
|
| : public extensions::AppWindowContents,
|
| - public content::WebContentsObserver,
|
| - public LauncherFaviconLoader::Delegate,
|
| - public extensions::ExtensionFunctionDispatcher::Delegate {
|
| + public LauncherFaviconLoader::Delegate {
|
| public:
|
| explicit AshPanelContents(extensions::AppWindow* host);
|
| ~AshPanelContents() override;
|
| @@ -47,29 +43,19 @@ class AshPanelContents
|
| void NativeWindowClosed() override;
|
| void DispatchWindowShownForTests() const override;
|
| content::WebContents* GetWebContents() const override;
|
| + extensions::WindowController* GetWindowController() const override;
|
|
|
| // LauncherFaviconLoader::Delegate overrides:
|
| void FaviconUpdated() override;
|
|
|
| - // extensions::ExtensionFunctionDispatcher::Delegate
|
| - extensions::WindowController* GetExtensionWindowController() const override;
|
| - content::WebContents* GetAssociatedWebContents() const override;
|
| -
|
| LauncherFaviconLoader* launcher_favicon_loader_for_test() {
|
| return launcher_favicon_loader_.get();
|
| }
|
|
|
| private:
|
| - // content::WebContentsObserver
|
| - bool OnMessageReceived(const IPC::Message& message) override;
|
| -
|
| - void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
| -
|
| extensions::AppWindow* host_;
|
| GURL url_;
|
| scoped_ptr<content::WebContents> web_contents_;
|
| - scoped_ptr<extensions::ExtensionFunctionDispatcher>
|
| - extension_function_dispatcher_;
|
| scoped_ptr<AshPanelWindowController> window_controller_;
|
| scoped_ptr<LauncherFaviconLoader> launcher_favicon_loader_;
|
|
|
|
|