summaryrefslogtreecommitdiffstats
path: root/views/widget/widget_gtk.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 21:31:10 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 21:31:10 +0000
commitabd6052b2b96066f75252b46e9fb856ec3512795 (patch)
tree74bc0b5a541e2b96e6801f4564729b7024bbc2f8 /views/widget/widget_gtk.h
parent346e2ce5fa245d37b56aabb0f591750f99a5cee1 (diff)
downloadchromium_src-abd6052b2b96066f75252b46e9fb856ec3512795.zip
chromium_src-abd6052b2b96066f75252b46e9fb856ec3512795.tar.gz
chromium_src-abd6052b2b96066f75252b46e9fb856ec3512795.tar.bz2
Hook up empty interfaces for NativeWidget/NativeWidgetDelegate.
These will be filled out in subsequent changelists to isolate the communication between Widget and WidgetWin/Gtk. BUG=72040 TEST=existing Review URL: http://codereview.chromium.org/6596013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget/widget_gtk.h')
-rw-r--r--views/widget/widget_gtk.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h
index 067f522..8c0cacd 100644
--- a/views/widget/widget_gtk.h
+++ b/views/widget/widget_gtk.h
@@ -13,6 +13,7 @@
#include "ui/base/x/active_window_watcher_x.h"
#include "ui/gfx/size.h"
#include "views/focus/focus_manager.h"
+#include "views/widget/native_widget.h"
#include "views/widget/widget.h"
namespace gfx {
@@ -29,13 +30,17 @@ using ui::OSExchangeDataProviderGtk;
namespace views {
class DropTargetGtk;
-class FocusSearch;
class TooltipManagerGtk;
class View;
class WindowGtk;
+namespace internal {
+class NativeWidgetDelegate;
+}
+
// Widget implementation for GTK.
class WidgetGtk : public Widget,
+ public internal::NativeWidget,
public ui::ActiveWindowWatcherX::Observer {
public:
// Type of widget.
@@ -323,6 +328,9 @@ class WidgetGtk : public Widget,
static void DrawTransparentBackground(GtkWidget* widget,
GdkEventExpose* event);
+ // A delegate implementation that handles events received here.
+ internal::NativeWidgetDelegate* delegate_;
+
const Type type_;
// Our native views. If we're a window/popup, then widget_ is the window and
@@ -419,10 +427,6 @@ class WidgetGtk : public Widget,
// this to determine whether we should process the event.
bool has_focus_;
- // Non owned pointer to optional delegate. May be NULL if no delegate is
- // being used.
- WidgetDelegate* delegate_;
-
// If true, the window stays on top of the screen. This is only used
// for types other than TYPE_CHILD.
bool always_on_top_;