summaryrefslogtreecommitdiffstats
path: root/ui/views/test
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 18:22:44 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-14 18:22:44 +0000
commit8a45c9775a4ccf87bf30a73df8954fe9446d6e2a (patch)
treefd100c56b428bb56b19f47291d95e4466d10e8bf /ui/views/test
parent23589b731fa97a94db920670795c9c91250c25f1 (diff)
downloadchromium_src-8a45c9775a4ccf87bf30a73df8954fe9446d6e2a.zip
chromium_src-8a45c9775a4ccf87bf30a73df8954fe9446d6e2a.tar.gz
chromium_src-8a45c9775a4ccf87bf30a73df8954fe9446d6e2a.tar.bz2
MonitorManager to manage multiple monitors.
This is clone of issue 9689027, which I can't access due to some internal error. BUG=115510 TEST=none Review URL: https://chromiumcodereview.appspot.com/9699013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/test')
-rw-r--r--ui/views/test/views_test_base.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 84e9baf..42ae3dd 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
+#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
#include "ui/aura/test/test_activation_client.h"
#include "ui/aura/test/test_screen.h"
@@ -79,6 +80,8 @@ void ViewsTestBase::SetUp() {
views_delegate_.reset(new TestViewsDelegate());
#if defined(USE_AURA)
root_window_.reset(new aura::RootWindow);
+ aura::Env::GetInstance()->SetMonitorManager(
+ aura::CreateSingleMonitorManager(root_window_.get()));
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
root_window_->SetProperty(
aura::client::kRootWindowInputMethodKey,