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

Unified Diff: content/test/test_renderer_host.cc

Issue 9701098: MultiMonitor support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shutdown order Created 8 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: content/test/test_renderer_host.cc
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc
index 16dd6f1a771340385eca5207901dfc3b626c773e..ac33f65c321b0bef2e3c265f8a8a77e8119068f2 100644
--- a/content/test/test_renderer_host.cc
+++ b/content/test/test_renderer_host.cc
@@ -13,6 +13,8 @@
#include "content/test/test_browser_context.h"
#if defined(USE_AURA)
+#include "ui/aura/env.h"
+#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/test/test_stacking_client.h"
@@ -181,7 +183,8 @@ void RenderViewHostTestHarness::Reload() {
void RenderViewHostTestHarness::SetUp() {
#if defined(USE_AURA)
- root_window_.reset(new aura::RootWindow);
+ root_window_.reset(aura::Env::GetInstance()->monitor_manager()->
+ CreateRootWindowForPrimaryMonitor());
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
test_stacking_client_.reset(
new aura::test::TestStackingClient(root_window_.get()));

Powered by Google App Engine
This is Rietveld 408576698