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

Unified Diff: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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: chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index f45e1c92086d8cc3d639b0d3ec4717dac9cfde0d..d82bba6ad21e28c6518cc8d7298c862b9ef10747 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/aura/test/single_monitor_manager.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
+#include "ui/gfx/screen.h"
#endif
#if defined(TOOLKIT_VIEWS)
@@ -132,7 +133,7 @@ class AccessibilityEventRouterViewsTest
new aura::test::SingleMonitorManager);
root_window_.reset(
aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
-#if defined(USE_ASH)
+#if defined(USE_AURA)
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
#endif // USE_ASH
test_stacking_client_.reset(

Powered by Google App Engine
This is Rietveld 408576698