Chromium Code Reviews| Index: chrome/browser/ui/views/extensions/extension_view_views.h |
| diff --git a/chrome/browser/ui/views/extensions/extension_view_views.h b/chrome/browser/ui/views/extensions/extension_view_views.h |
| index bb490f6400d2042cafe23b16b9f066214fb5b90f..34024388d10aa12107f8eff38323edd046b614f5 100644 |
| --- a/chrome/browser/ui/views/extensions/extension_view_views.h |
| +++ b/chrome/browser/ui/views/extensions/extension_view_views.h |
| @@ -7,11 +7,10 @@ |
| #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/views/controls/native/native_view_host.h" |
| -class Browser; |
| - |
| namespace content { |
| class RenderViewHost; |
| } |
| @@ -22,7 +21,8 @@ class ExtensionHost; |
| } |
| // This handles the display portion of an ExtensionHost. |
| -class ExtensionViewViews : public views::NativeViewHost { |
| +class ExtensionViewViews : public ExtensionView, |
| + public views::NativeViewHost { |
|
tfarina
2012/09/14 01:56:29
Looks like we will need to have a ExtensionViewHos
|
| public: |
| ExtensionViewViews(extensions::ExtensionHost* host, Browser* browser); |
| virtual ~ExtensionViewViews(); |
| @@ -36,26 +36,18 @@ class ExtensionViewViews : public views::NativeViewHost { |
| virtual void OnViewWasResized() {} |
| }; |
| + // Sets the container for this view. |
| + void SetContainer(Container* container) { container_ = container; } |
| + |
| extensions::ExtensionHost* host() const { return host_; } |
| - Browser* browser() const { return browser_; } |
| const extensions::Extension* extension() const; |
| content::RenderViewHost* render_view_host() const; |
| - void DidStopLoading(); |
| - void SetIsClipped(bool is_clipped); |
| - |
| - // Notification from ExtensionHost. |
| - void ResizeDueToAutoResize(const gfx::Size& new_size); |
| - // Method for the ExtensionHost to notify us when the RenderViewHost has a |
| - // connection. |
| - void RenderViewCreated(); |
| + void SetIsClipped(bool is_clipped); |
| // Set a custom background for the view. The background will be tiled. |
| void SetBackground(const SkBitmap& background); |
| - // Sets the container for this view. |
| - void SetContainer(Container* container) { container_ = container; } |
| - |
| // Overridden from views::NativeViewHost: |
| virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) OVERRIDE; |
| virtual void SetVisible(bool is_visible) OVERRIDE; |
| @@ -72,6 +64,12 @@ class ExtensionViewViews : public views::NativeViewHost { |
| private: |
| friend class extensions::ExtensionHost; |
| + // Overridden from ExtensionView: |
| + virtual Browser* GetBrowser() OVERRIDE; |
| + virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE; |
| + virtual void RenderViewCreated() OVERRIDE; |
| + virtual void DidStopLoading() OVERRIDE; |
| + |
| // Initializes the RenderWidgetHostView for this object. |
| void CreateWidgetHostView(); |