diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 01:04:24 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-21 01:04:24 +0000 |
| commit | e050ef1444006c87364b8bede8a0df8e463525dc (patch) | |
| tree | 204fe03296b7e8c8918945768fefcf5cd5ead7be /content | |
| parent | 4a4c337c42676cdb024fd943a7c97400abe58cad (diff) | |
| download | chromium_src-e050ef1444006c87364b8bede8a0df8e463525dc.zip chromium_src-e050ef1444006c87364b8bede8a0df8e463525dc.tar.gz chromium_src-e050ef1444006c87364b8bede8a0df8e463525dc.tar.bz2 | |
* MultiMonitorManager creates and manages mutliple monitor instance
* MonitorContrler controls root window <-> monitor mapping and resize/reposition root window to match monitor configuration.
* Moved use_fullscreen_host_window to MonitorManager
* Moved compositor initialize/terminate to Env as there can be more than one root window.
BUG=115510
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9701098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/test/test_renderer_host.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/test/test_renderer_host.cc b/content/test/test_renderer_host.cc index 16dd6f1..1f578f6 100644 --- a/content/test/test_renderer_host.cc +++ b/content/test/test_renderer_host.cc @@ -13,6 +13,7 @@ #include "content/test/test_browser_context.h" #if defined(USE_AURA) +#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 +182,7 @@ void RenderViewHostTestHarness::Reload() { void RenderViewHostTestHarness::SetUp() { #if defined(USE_AURA) - root_window_.reset(new aura::RootWindow); + root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); test_stacking_client_.reset( new aura::test::TestStackingClient(root_window_.get())); |