Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: views/widget/widget_unittest.cc

Issue 7741001: Add Aura support to views: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/window/custom_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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),
« no previous file with comments | « views/widget/native_widget_aura.cc ('k') | views/window/custom_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698