| Index: chrome/browser/ui/views/aura/panel_view_aura.h
|
| diff --git a/chrome/browser/ui/views/aura/panel_view_aura.h b/chrome/browser/ui/views/aura/panel_view_aura.h
|
| index 66d2191f10f1725d1d4e2278f2bbcbed0dc07e6d..2f445d00a8f7fe5d5aeb8456a47476feb256b9b6 100644
|
| --- a/chrome/browser/ui/views/aura/panel_view_aura.h
|
| +++ b/chrome/browser/ui/views/aura/panel_view_aura.h
|
| @@ -9,10 +9,13 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "chrome/browser/sessions/session_id.h"
|
| +#include "chrome/browser/ui/base_window.h"
|
| #include "ui/gfx/size.h"
|
| #include "ui/views/controls/native/native_view_host.h"
|
| #include "ui/views/widget/widget_delegate.h"
|
|
|
| +class ExtensionWindowController;
|
| class GURL;
|
| class Profile;
|
|
|
| @@ -32,7 +35,8 @@ class PanelHost;
|
| // PanelViewAura is used to display HTML in a Panel window.
|
| //
|
| class PanelViewAura : public views::NativeViewHost,
|
| - public views::WidgetDelegate {
|
| + public views::WidgetDelegate,
|
| + public BaseWindow {
|
| public:
|
| explicit PanelViewAura(const std::string& title);
|
| virtual ~PanelViewAura();
|
| @@ -50,6 +54,11 @@ class PanelViewAura : public views::NativeViewHost,
|
| // Set the preferred size of the contents.
|
| void SetContentPreferredSize(const gfx::Size& size);
|
|
|
| + const SessionID& session_id() const { return session_id_; }
|
| + ExtensionWindowController* extension_window_controller() const {
|
| + return extension_window_controller_.get();
|
| + }
|
| +
|
| // Overridden from views::View:
|
| virtual gfx::Size GetPreferredSize() OVERRIDE;
|
|
|
| @@ -63,13 +72,32 @@ class PanelViewAura : public views::NativeViewHost,
|
| virtual const views::Widget* GetWidget() const OVERRIDE;
|
| virtual views::NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
|
|
|
| + // Overridden from BaseWindow:
|
| + virtual bool IsActive() const OVERRIDE;
|
| + virtual bool IsMaximized() const OVERRIDE;
|
| + virtual bool IsMinimized() const OVERRIDE;
|
| + virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
|
| + virtual gfx::Rect GetBounds() const OVERRIDE;
|
| + virtual void Show() OVERRIDE;
|
| + virtual void ShowInactive() OVERRIDE;
|
| + virtual void Close() OVERRIDE;
|
| + virtual void Activate() OVERRIDE;
|
| + virtual void Deactivate() OVERRIDE;
|
| + virtual void Maximize() OVERRIDE;
|
| + virtual void Minimize() OVERRIDE;
|
| + virtual void Restore() OVERRIDE;
|
| + virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
|
| + virtual void FlashFrame(bool flash) OVERRIDE;
|
| +
|
| private:
|
| + const SessionID session_id_;
|
| std::string title_;
|
| gfx::Size preferred_size_;
|
| // Owned internal host class implementing WebContents and Extension Delegates.
|
| scoped_ptr<internal::PanelHost> host_;
|
| // Unowned pointer to the widget.
|
| views::Widget* widget_;
|
| + scoped_ptr<ExtensionWindowController> extension_window_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PanelViewAura);
|
| };
|
|
|