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

Unified Diff: ash/test/ash_test_base.h

Issue 11825015: [Cleanup] consolidate DISABLED macros in mouse_cursor_event_filter_unittests.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | « ash/extended_desktop_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.h
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 40ae938c38607cf3f0490631efd3e47f9cce8694..8b77e0fa210728598bf613d58c283fea8784d526 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -18,12 +18,16 @@
namespace aura {
class Window;
class WindowDelegate;
-}
+
+namespace test {
+class EventGenerator;
+} // namespace test
+} // namespace aura
namespace ash {
namespace internal {
class DisplayManager;
-} // internal
+} // namespace internal
namespace test {
@@ -81,6 +85,11 @@ class AshTestBase : public testing::Test {
// Attach |window| to the current shell's root window.
void SetDefaultParentByPrimaryRootWindow(aura::Window* window);
+ // Returns the EventGenerator that uses screen coordinates and works
+ // across multiple displays. It createse a new generator if it
+ // hasn't been created yet.
+ aura::test::EventGenerator& GetEventGenerator();
+
protected:
void RunAllPendingInMessageLoop();
@@ -95,6 +104,8 @@ class AshTestBase : public testing::Test {
TestShellDelegate* test_shell_delegate_;
+ scoped_ptr<aura::test::EventGenerator> event_generator_;
+
DISALLOW_COPY_AND_ASSIGN(AshTestBase);
};
« no previous file with comments | « ash/extended_desktop_unittest.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698