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

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

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.cc
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc
index 18d1b14f2d26c6f64c2aa69e211fecec6f33b930..fe9753d2abfd1e0d7d296455377c7ecf77db7cbe 100644
--- a/ui/views/test/widget_test.cc
+++ b/ui/views/test/widget_test.cc
@@ -10,12 +10,11 @@
namespace views {
namespace test {
-// A widget that assumes mouse capture always works. It won't on Aura in
-// testing, so we mock it.
-#if defined(USE_AURA)
+// A widget that assumes mouse capture always works. It won't in testing, so we
+// mock it.
NativeWidgetCapture::NativeWidgetCapture(
internal::NativeWidgetDelegate* delegate)
- : NativeWidgetPlatform(delegate),
+ : NativeWidgetAura(delegate),
mouse_capture_(false) {}
NativeWidgetCapture::~NativeWidgetCapture() {}
@@ -32,14 +31,13 @@ void NativeWidgetCapture::ReleaseCapture() {
bool NativeWidgetCapture::HasCapture() const {
return mouse_capture_;
}
-#endif
WidgetTest::WidgetTest() {}
WidgetTest::~WidgetTest() {}
NativeWidget* WidgetTest::CreatePlatformNativeWidget(
internal::NativeWidgetDelegate* delegate) {
- return new NativeWidgetPlatformForTest(delegate);
+ return new NativeWidgetCapture(delegate);
}
Widget* WidgetTest::CreateTopLevelPlatformWidget() {

Powered by Google App Engine
This is Rietveld 408576698