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 /ui/views | |
| 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 'ui/views')
| -rw-r--r-- | ui/views/test/views_test_base.cc | 3 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura_unittest.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index c41ea5b..e1999d8 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -79,8 +79,7 @@ void ViewsTestBase::SetUp() { if (!views_delegate_.get()) views_delegate_.reset(new TestViewsDelegate()); #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())); root_window_->SetProperty( aura::client::kRootWindowInputMethodKey, diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index dd8759a..59f87a7 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/aura/env.h" #include "ui/aura/layout_manager.h" #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window.h" @@ -36,8 +35,8 @@ class NativeWidgetAuraTest : public testing::Test { // testing::Test overrides: virtual void SetUp() OVERRIDE { - root_window_.reset(aura::Env::GetInstance()->monitor_manager()-> - CreateRootWindowForPrimaryMonitor()); + root_window_.reset( + aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); root_window_->SetBounds(gfx::Rect(0, 0, 640, 480)); root_window_->SetHostSize(gfx::Size(640, 480)); |