diff options
Diffstat (limited to 'views/window/window_win.h')
| -rw-r--r-- | views/window/window_win.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/views/window/window_win.h b/views/window/window_win.h index 71f2273..5ade949 100644 --- a/views/window/window_win.h +++ b/views/window/window_win.h @@ -41,9 +41,10 @@ class WindowDelegate; // /////////////////////////////////////////////////////////////////////////////// class WindowWin : public WidgetWin, - public NativeWindow { + public NativeWindow, + public Window { public: - explicit WindowWin(internal::NativeWindowDelegate* delegate); + WindowWin(); virtual ~WindowWin(); // Show the window with the specified show command. @@ -66,10 +67,6 @@ class WindowWin : public WidgetWin, // Returns the system set window title font. static gfx::Font GetWindowTitleFont(); - // Overridden from NativeWindow: - virtual Window* GetWindow() OVERRIDE; - virtual const Window* GetWindow() const OVERRIDE; - protected: friend Window; @@ -126,6 +123,8 @@ class WindowWin : public WidgetWin, virtual void OnSize(UINT size_param, const CSize& new_size) OVERRIDE; virtual void OnSysCommand(UINT notification_code, CPoint click) OVERRIDE; virtual void OnWindowPosChanging(WINDOWPOS* window_pos) OVERRIDE; + virtual Window* GetWindow() OVERRIDE { return this; } + virtual const Window* GetWindow() const OVERRIDE { return this; } virtual void Close() OVERRIDE; virtual void SetInitialFocus() OVERRIDE; @@ -160,6 +159,7 @@ class WindowWin : public WidgetWin, virtual void SetFullscreen(bool fullscreen) OVERRIDE; virtual bool IsFullscreen() const OVERRIDE; virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; + virtual bool IsAppWindow() const OVERRIDE; virtual void SetUseDragFrame(bool use_drag_frame) OVERRIDE; virtual NonClientFrameView* CreateFrameViewForWindow() OVERRIDE; virtual void UpdateFrameAfterFrameChange() OVERRIDE; |