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

Unified Diff: ui/views/test/widget_test.h

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 9 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
Index: ui/views/test/widget_test.h
diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h
index 6766370ff7dfd398959b4a20704a95abdb61f259..dbb8abb53864d5ce1f97f33e8550c66d9ba9283a 100644
--- a/ui/views/test/widget_test.h
+++ b/ui/views/test/widget_test.h
@@ -7,10 +7,7 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/views/test/views_test_base.h"
-
-#if defined(USE_AURA)
#include "ui/views/widget/native_widget_aura.h"
-#endif
namespace views {
@@ -25,14 +22,9 @@ class RootView;
namespace test {
-#if defined(USE_AURA)
-// A typedef that inserts our mock-capture NativeWidget implementation for
-// relevant platforms.
-typedef NativeWidgetAura NativeWidgetPlatform;
-
// A widget that assumes mouse capture always works. It won't on Aura in
// testing, so we mock it.
-class NativeWidgetCapture : public NativeWidgetPlatform {
+class NativeWidgetCapture : public NativeWidgetAura {
public:
explicit NativeWidgetCapture(internal::NativeWidgetDelegate* delegate);
virtual ~NativeWidgetCapture();
@@ -47,10 +39,6 @@ class NativeWidgetCapture : public NativeWidgetPlatform {
DISALLOW_COPY_AND_ASSIGN(NativeWidgetCapture);
};
-// A generic typedef to pick up relevant NativeWidget implementations.
-typedef NativeWidgetCapture NativeWidgetPlatformForTest;
-#endif
-
class WidgetTest : public ViewsTestBase {
public:
WidgetTest();

Powered by Google App Engine
This is Rietveld 408576698