| Index: chrome/browser/ui/gtk/extensions/extension_view_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/extensions/extension_view_gtk.h b/chrome/browser/ui/gtk/extensions/extension_view_gtk.h
|
| index 97cdd80b24f6c4be733822f4bfcd251d7e21f9f4..d095f88feb06aadf9d3a7a7ad0dc6322f19bd82c 100644
|
| --- a/chrome/browser/ui/gtk/extensions/extension_view_gtk.h
|
| +++ b/chrome/browser/ui/gtk/extensions/extension_view_gtk.h
|
| @@ -6,12 +6,10 @@
|
| #define CHROME_BROWSER_UI_GTK_EXTENSIONS_EXTENSION_VIEW_GTK_H_
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/compiler_specific.h"
|
| +#include "chrome/browser/extensions/extension_view.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| -#include "ui/gfx/size.h"
|
| -
|
| -class Browser;
|
| -class SkBitmap;
|
|
|
| namespace content {
|
| class RenderViewHost;
|
| @@ -21,38 +19,27 @@ namespace extensions {
|
| class ExtensionHost;
|
| }
|
|
|
| -class ExtensionViewGtk {
|
| +class ExtensionViewGtk : public ExtensionView {
|
| public:
|
| ExtensionViewGtk(extensions::ExtensionHost* extension_host, Browser* browser);
|
| -
|
| - class Container {
|
| - public:
|
| - virtual ~Container() {}
|
| - virtual void OnExtensionSizeChanged(ExtensionViewGtk* view,
|
| - const gfx::Size& new_size) {}
|
| - };
|
| + virtual ~ExtensionViewGtk();
|
|
|
| void Init();
|
|
|
| - gfx::NativeView native_view();
|
| - Browser* browser() const { return browser_; }
|
| -
|
| void SetBackground(const SkBitmap& background);
|
|
|
| - // Sets the container for this view.
|
| - void SetContainer(Container* container) { container_ = container; }
|
| -
|
| - // Method for the ExtensionHost to notify us about the correct size for
|
| - // extension contents.
|
| - void ResizeDueToAutoResize(const gfx::Size& new_size);
|
| -
|
| - // Method for the ExtensionHost to notify us when the RenderViewHost has a
|
| - // connection.
|
| - void RenderViewCreated();
|
| -
|
| - content::RenderViewHost* render_view_host() const;
|
| -
|
| private:
|
| + // Overridden from ExtensionView:
|
| + virtual Browser* GetBrowser() OVERRIDE;
|
| + virtual const Browser* GetBrowser() const OVERRIDE;
|
| + virtual gfx::NativeView GetNativeView() OVERRIDE;
|
| + virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
|
| + virtual void SetContainer(ExtensionViewContainer* container) OVERRIDE;
|
| + virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE;
|
| + virtual void RenderViewCreated() OVERRIDE;
|
| + virtual void DidStopLoading() OVERRIDE;
|
| + virtual void WindowFrameChanged() OVERRIDE;
|
| +
|
| void CreateWidgetHostView();
|
|
|
| Browser* browser_;
|
| @@ -64,7 +51,7 @@ class ExtensionViewGtk {
|
| SkBitmap pending_background_;
|
|
|
| // This view's container.
|
| - Container* container_;
|
| + ExtensionViewContainer* container_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionViewGtk);
|
| };
|
|
|