diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:14:03 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 23:14:03 +0000 |
| commit | de4ec531ed531ea578a783f7da16f67ce0f6d658 (patch) | |
| tree | 4ec6d291f8da0240e153e4ce126d625d5fe89c5d /ui/views/widget/native_widget_aura.h | |
| parent | 6a73c3006dde579493a5b070fe9bd3008608d5b1 (diff) | |
| download | chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.zip chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.tar.gz chromium_src-de4ec531ed531ea578a783f7da16f67ce0f6d658.tar.bz2 | |
Ash/aura split: Get views_examples_exe semi-running on linux/X11.
This adds tons of hacks, most of which should be clearly labeled with TODOs.
BUG=119759
TEST=
Review URL: http://codereview.chromium.org/9873035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/native_widget_aura.h')
| -rw-r--r-- | ui/views/widget/native_widget_aura.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index 8ba42f3..2621918 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -16,6 +16,7 @@ #include "ui/views/widget/native_widget_private.h" namespace aura { +class RootWindow; class Window; } namespace gfx { @@ -35,6 +36,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate); virtual ~NativeWidgetAura(); + static void set_aura_desktop_hax() { g_aura_desktop_hax = true; } + // TODO(beng): Find a better place for this, and the similar method on // NativeWidgetWin. static gfx::Font GetWindowTitleFont(); @@ -167,6 +170,7 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, internal::NativeWidgetDelegate* delegate_; + scoped_ptr<aura::RootWindow> root_window_; aura::Window* window_; // See class documentation for Widget in widget.h for a note about ownership. @@ -191,6 +195,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate, scoped_ptr<DropHelper> drop_helper_; int last_drop_operation_; + static bool g_aura_desktop_hax; + DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); }; |