diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:28:59 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 16:28:59 +0000 |
| commit | 6b0d410f93c51862e219ecb50eed2065ab952f71 (patch) | |
| tree | a76b708e4e87aee959394b159a130e9ed77c2a2e /ui/views | |
| parent | d5eb9eda038370b612940244780929a8557213f1 (diff) | |
| download | chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.zip chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.gz chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.bz2 | |
Don't set single monitor manager under multi monitor environment.
BUG=28581
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9923027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129867 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 | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc index e1999d8..9ed163a 100644 --- a/ui/views/test/views_test_base.cc +++ b/ui/views/test/views_test_base.cc @@ -10,6 +10,7 @@ #include "ui/aura/env.h" #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window.h" +#include "ui/aura/test/single_monitor_manager.h" #include "ui/aura/test/test_activation_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" @@ -79,6 +80,8 @@ void ViewsTestBase::SetUp() { if (!views_delegate_.get()) views_delegate_.reset(new TestViewsDelegate()); #if defined(USE_AURA) + aura::Env::GetInstance()->SetMonitorManager( + new aura::test::SingleMonitorManager); root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); root_window_->SetProperty( diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index cfe79f7..abfcd57 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -8,9 +8,11 @@ #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" +#include "ui/aura/test/single_monitor_manager.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" #include "ui/aura/window.h" @@ -35,6 +37,8 @@ class NativeWidgetAuraTest : public testing::Test { // testing::Test overrides: virtual void SetUp() OVERRIDE { + aura::Env::GetInstance()->SetMonitorManager( + new aura::test::SingleMonitorManager); root_window_.reset( aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); |