| Index: chrome/browser/ui/cocoa/extensions/extension_view_mac.h
|
| diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
|
| index bbe08f964165d10711370865be8a065a85576e49..4c27c07ca89b00ebb2c852952dc505bffc552a09 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
|
| +++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
|
| @@ -6,68 +6,26 @@
|
| #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_EXTENSION_VIEW_MAC_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;
|
| -}
|
| -
|
| -namespace extensions {
|
| -class ExtensionHost;
|
| -}
|
| -
|
| // This class represents extension views. An extension view internally contains
|
| // a bridge to an extension process, which draws to the extension view's
|
| // native view object through IPC.
|
| -class ExtensionViewMac {
|
| +class ExtensionViewMac : public ExtensionView {
|
| public:
|
| - class Container {
|
| - public:
|
| - virtual ~Container() {}
|
| - virtual void OnExtensionSizeChanged(ExtensionViewMac* view,
|
| - const gfx::Size& new_size) {}
|
| - virtual void OnExtensionViewDidShow(ExtensionViewMac* view) {};
|
| - };
|
| -
|
| ExtensionViewMac(extensions::ExtensionHost* extension_host, Browser* browser);
|
| - ~ExtensionViewMac();
|
| + virtual ~ExtensionViewMac();
|
|
|
| // Starts the extension process and creates the native view. You must call
|
| // this method before calling any of this class's other methods.
|
| void Init();
|
|
|
| - // Returns the extension's native view.
|
| - gfx::NativeView native_view();
|
| -
|
| - // Returns the browser the extension belongs to.
|
| - Browser* browser() const { return browser_; }
|
| -
|
| - // Method for the ExtensionHost to notify us that the extension page is
|
| - // loaded.
|
| - void DidStopLoading();
|
| -
|
| // Sets the extensions's background image.
|
| void SetBackground(const SkBitmap& background);
|
|
|
| - // Sets the container for this view.
|
| - void set_container(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();
|
| -
|
| - // Informs the view that its containing window's frame changed.
|
| - void WindowFrameChanged();
|
| -
|
| // The minimum/maximum dimensions of the popup.
|
| // The minimum is just a little larger than the size of the button itself.
|
| // The maximum is an arbitrary number that should be smaller than most
|
| @@ -78,7 +36,16 @@ class ExtensionViewMac {
|
| static const CGFloat kMaxHeight;
|
|
|
| private:
|
| - content::RenderViewHost* render_view_host() const;
|
| + // 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();
|
|
|
| @@ -97,7 +64,7 @@ class ExtensionViewMac {
|
| // loaded.
|
| gfx::Size pending_preferred_size_;
|
|
|
| - Container* container_;
|
| + ExtensionViewContainer* container_; // weak
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionViewMac);
|
| };
|
|
|