diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:56:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 02:56:32 +0000 |
| commit | eaf001143552fc19fba063c1b179d92cc35a2b43 (patch) | |
| tree | 88f0dc0f0ea98ede7ce374c590ba982a46478fee /views | |
| parent | 0e7e8c0e6ee3def09065c18385daa0fce8f45ff8 (diff) | |
| download | chromium_src-eaf001143552fc19fba063c1b179d92cc35a2b43.zip chromium_src-eaf001143552fc19fba063c1b179d92cc35a2b43.tar.gz chromium_src-eaf001143552fc19fba063c1b179d92cc35a2b43.tar.bz2 | |
Make BrowserFrame concrete, create NativeBrowserFrame and NativeBrowserFrameDelegate.
BUG=72040
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/6677003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/window/native_window.h | 11 | ||||
| -rw-r--r-- | views/window/window_gtk.cc | 4 | ||||
| -rw-r--r-- | views/window/window_gtk.h | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/views/window/native_window.h b/views/window/native_window.h index 6275e1a..9236689 100644 --- a/views/window/native_window.h +++ b/views/window/native_window.h @@ -6,10 +6,19 @@ #define VIEWS_WIDGET_NATIVE_WINDOW_H_ #pragma once +#include "ui/gfx/native_widget_types.h" #include "views/accessibility/accessibility_types.h" +class SkBitmap; + +namespace gfx { +class Rect; +class Size; +} + namespace views { +class NativeWidget; class NonClientFrameView; //////////////////////////////////////////////////////////////////////////////// @@ -26,6 +35,8 @@ class NativeWindow { virtual ~NativeWindow() {} + virtual Window* GetWindow() = 0; + protected: friend class Window; diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc index a24ce61..5e625a6 100644 --- a/views/window/window_gtk.cc +++ b/views/window/window_gtk.cc @@ -300,6 +300,10 @@ const NativeWidget* WindowGtk::AsNativeWidget() const { return this; } +Window* WindowGtk::GetWindow() { + return this; +} + void WindowGtk::SetWindowBounds(const gfx::Rect& bounds, gfx::NativeWindow other_window) { // TODO: need to deal with other_window. diff --git a/views/window/window_gtk.h b/views/window/window_gtk.h index 1797bf8..5e9915a 100644 --- a/views/window/window_gtk.h +++ b/views/window/window_gtk.h @@ -60,6 +60,7 @@ class WindowGtk : public WidgetGtk, public NativeWindow, public Window { virtual void SetAccessibleState(AccessibilityTypes::State state) OVERRIDE; virtual NativeWidget* AsNativeWidget() OVERRIDE; virtual const NativeWidget* AsNativeWidget() const OVERRIDE; + virtual Window* GetWindow() OVERRIDE; virtual void SetWindowBounds(const gfx::Rect& bounds, gfx::NativeWindow other_window) OVERRIDE; virtual void HideWindow() OVERRIDE; |