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

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

Issue 322893005: MacViews: Add WidgetEventGenerator to abstract platform-specific event generation for tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cull orthogonal stuff, add WidgetTest.MouseEventTypesViaGenerator Created 6 years, 6 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 dbb8abb53864d5ce1f97f33e8550c66d9ba9283a..6b4ab9126f1aec86b21c42d3831aa7659677e3fa 100644
--- a/ui/views/test/widget_test.h
+++ b/ui/views/test/widget_test.h
@@ -7,13 +7,35 @@
#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"
+# if !defined(OS_CHROMEOS)
+# include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
+# endif
+#elif defined(OS_MACOSX)
+#include "ui/views/widget/native_widget_mac.h"
+#endif
+
+namespace ui {
+class EventProcessor;
+}
namespace views {
class NativeWidget;
class Widget;
+#if defined(USE_AURA)
+typedef NativeWidgetAura PlatformNativeWidget;
+# if !defined(OS_CHROMEOS)
+typedef DesktopNativeWidgetAura PlatformDesktopNativeWidget;
+# endif
+#elif defined(OS_MACOSX)
+typedef NativeWidgetMac PlatformNativeWidget;
+typedef NativeWidgetMac PlatformDesktopNativeWidget;
+#endif
+
namespace internal {
class RootView;
@@ -24,7 +46,7 @@ namespace test {
// A widget that assumes mouse capture always works. It won't on Aura in
// testing, so we mock it.
-class NativeWidgetCapture : public NativeWidgetAura {
+class NativeWidgetCapture : public PlatformNativeWidget {
public:
explicit NativeWidgetCapture(internal::NativeWidgetDelegate* delegate);
virtual ~NativeWidgetCapture();
@@ -65,6 +87,14 @@ class WidgetTest : public ViewsTestBase {
View* GetGestureHandler(internal::RootView* root_view);
+ // Return true if |window| is visible according to the native platform.
+ static bool IsNativeWindowVisible(gfx::NativeWindow window);
+
+ // Return the event processor for |widget|. On aura platforms, this is an
+ // aura::WindowEventDispatcher. Otherwise, it is a bridge to the OS event
+ // processor.
+ static ui::EventProcessor* GetEventProcessor(Widget* widget);
+
private:
DISALLOW_COPY_AND_ASSIGN(WidgetTest);
};

Powered by Google App Engine
This is Rietveld 408576698