diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:28:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:28:59 +0000 |
| commit | 6b0d410f93c51862e219ecb50eed2065ab952f71 (patch) | |
| tree | a76b708e4e87aee959394b159a130e9ed77c2a2e /content | |
| parent | d5eb9eda038370b612940244780929a8557213f1 (diff) | |
| download | chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.zip chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.gz chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.bz2 | |
Don't set single monitor manager under multi monitor environment.
BUG=28581
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9923027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/test_renderer_host.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc index 21df81b..03ce44e 100644 --- a/content/test/test_renderer_host.cc +++ b/content/test/test_renderer_host.cc @@ -14,8 +14,10 @@ #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/single_monitor_manager.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" #endif @@ -190,6 +192,8 @@ void RenderViewHostTestHarness::Reload() { void RenderViewHostTestHarness::SetUp() { #if defined(USE_AURA) + aura::Env::GetInstance()->SetMonitorManager( + new aura::test::SingleMonitorManager); root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); test_stacking_client_.reset( |