summaryrefslogtreecommitdiffstats
path: root/ui/views
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 23:49:05 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 23:49:05 +0000
commite639d856bed0c08bea8b49bf5ee472ce2aa860be (patch)
treea40eb69820cd9879460797b8a5efe6291dd77a6d /ui/views
parentd9e7a496b26c6d8a7c8daa47588f956f361af4fd (diff)
downloadchromium_src-e639d856bed0c08bea8b49bf5ee472ce2aa860be.zip
chromium_src-e639d856bed0c08bea8b49bf5ee472ce2aa860be.tar.gz
chromium_src-e639d856bed0c08bea8b49bf5ee472ce2aa860be.tar.bz2
Revert 132294 - Aura demo fix
BUG=123311 TEST=sadrul@chromium.org Review URL: http://codereview.chromium.org/10082008 TBR=oshima@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
-rw-r--r--ui/views/test/views_test_base.cc5
-rw-r--r--ui/views/widget/native_widget_aura_unittest.cc5
2 files changed, 6 insertions, 4 deletions
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index 996582f..1e05f50 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -14,7 +14,7 @@
#include "ui/aura/env.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
#include "ui/aura/test/test_activation_client.h"
#include "ui/aura/test/test_stacking_client.h"
#include "ui/base/ime/input_method.h"
@@ -83,7 +83,8 @@ void ViewsTestBase::SetUp() {
if (!views_delegate_.get())
views_delegate_.reset(new TestViewsDelegate());
#if defined(USE_AURA)
- aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+ aura::Env::GetInstance()->SetMonitorManager(
+ new aura::test::SingleMonitorManager);
root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
#if defined(USE_ASH)
gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc
index ecf03e4..163f43c 100644
--- a/ui/views/widget/native_widget_aura_unittest.cc
+++ b/ui/views/widget/native_widget_aura_unittest.cc
@@ -12,7 +12,7 @@
#include "ui/aura/layout_manager.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/test/single_monitor_manager.h"
#include "ui/aura/test/test_stacking_client.h"
#include "ui/aura/window.h"
#include "ui/views/widget/root_view.h"
@@ -40,7 +40,8 @@ class NativeWidgetAuraTest : public testing::Test {
// testing::Test overrides:
virtual void SetUp() OVERRIDE {
- aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager);
+ aura::Env::GetInstance()->SetMonitorManager(
+ new aura::test::SingleMonitorManager);
root_window_.reset(
aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
#if defined(USE_ASH)