diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 20:56:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-16 20:56:28 +0000 |
| commit | 193b39d2ef3ec7a4f1692fd4448c515c06bb46d1 (patch) | |
| tree | b35587f06293535725508764137b06c6c413c5ff /ui/views/test | |
| parent | 911cbcdade8c9386b68e3ee87cb9c2ea1c48db8e (diff) | |
| download | chromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.zip chromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.tar.gz chromium_src-193b39d2ef3ec7a4f1692fd4448c515c06bb46d1.tar.bz2 | |
Native bounds support to host windows.
* Moved SingleMonitorManager into separate file. This is a default
MonitorManager and creates RootWindow for PrimaryMonitor.
* Added MonitorObserver and moved monitor change logic to ash.
* MultiMonitorManager class and its layout logic will live in ash too.
* Added ability to move host window so that we can re-arrange root window when
switching primary monitor.
* Removed monitor_manager_x11, which I committed by accident.
* Use (0,0) for monitor/workarea bounds because the coordinate isn't translated yet
for non primary screens.
BUG=115510
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9703083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test')
| -rw-r--r-- | ui/views/test/views_test_base.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index 42ae3dd..c41ea5b 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -79,9 +79,8 @@ void ViewsTestBase::SetUp() { if (!views_delegate_.get()) views_delegate_.reset(new TestViewsDelegate()); #if defined(USE_AURA) - root_window_.reset(new aura::RootWindow); - aura::Env::GetInstance()->SetMonitorManager( - aura::CreateSingleMonitorManager(root_window_.get())); + root_window_.reset(aura::Env::GetInstance()->monitor_manager()-> + CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); root_window_->SetProperty( aura::client::kRootWindowInputMethodKey, |