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 /chrome/browser/ui | |
| 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 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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 1ac858a..01ee4a5 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -25,7 +25,6 @@ #include "ui/views/widget/widget_delegate.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" @@ -127,8 +126,8 @@ class AccessibilityEventRouterViewsTest virtual void SetUp() { views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate(); #if defined(USE_AURA) - root_window_.reset(aura::Env::GetInstance()->monitor_manager()-> - CreateRootWindowForPrimaryMonitor()); + 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())); |