| Index: views/widget/widget_unittest.cc
|
| ===================================================================
|
| --- views/widget/widget_unittest.cc (revision 98084)
|
| +++ views/widget/widget_unittest.cc (working copy)
|
| @@ -11,7 +11,9 @@
|
| #include "views/test/test_views_delegate.h"
|
| #include "views/views_delegate.h"
|
|
|
| -#if defined(OS_WIN)
|
| +#if defined(USE_AURA)
|
| +#include "views/widget/native_widget_aura.h"
|
| +#elif defined(OS_WIN)
|
| #include "views/widget/native_widget_win.h"
|
| #elif defined(TOOLKIT_USES_GTK)
|
| #include "views/widget/native_widget_gtk.h"
|
| @@ -114,7 +116,9 @@
|
|
|
| NativeWidget* CreatePlatformNativeWidget(
|
| internal::NativeWidgetDelegate* delegate) {
|
| -#if defined(OS_WIN)
|
| +#if defined(USE_AURA)
|
| + return new NativeWidgetAura(delegate);
|
| +#elif defined(OS_WIN)
|
| return new NativeWidgetWin(delegate);
|
| #elif defined(TOOLKIT_USES_GTK)
|
| return new NativeWidgetGtkCapture(delegate);
|
| @@ -311,7 +315,9 @@
|
| // A platform NativeWidget subclass that updates a bag of state when it is
|
| // destroyed.
|
| class OwnershipTestNativeWidget :
|
| -#if defined(OS_WIN)
|
| +#if defined(USE_AURA)
|
| + public NativeWidgetAura,
|
| +#elif defined(OS_WIN)
|
| public NativeWidgetWin {
|
| #elif defined(TOOLKIT_USES_GTK)
|
| public NativeWidgetGtk {
|
| @@ -319,7 +325,9 @@
|
| public:
|
| OwnershipTestNativeWidget(internal::NativeWidgetDelegate* delegate,
|
| OwnershipTestState* state)
|
| -#if defined(OS_WIN)
|
| +#if defined(USE_AURA)
|
| + : NativeWidgetAura(delegate),
|
| +#elif defined(OS_WIN)
|
| : NativeWidgetWin(delegate),
|
| #elif defined(TOOLKIT_USES_GTK)
|
| : NativeWidgetGtk(delegate),
|
|
|