diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 01:58:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 01:58:56 +0000 |
| commit | ce7cfc0c183b55a3e9f596012be14eb1f6000186 (patch) | |
| tree | afc17f64276b0fab2ff74a886a9d263d5bd3c4d3 /ui/views/widget | |
| parent | 7326e808e4028b8b3183a85b10c1dfe98ffe630c (diff) | |
| download | chromium_src-ce7cfc0c183b55a3e9f596012be14eb1f6000186.zip chromium_src-ce7cfc0c183b55a3e9f596012be14eb1f6000186.tar.gz chromium_src-ce7cfc0c183b55a3e9f596012be14eb1f6000186.tar.bz2 | |
Aura demo fix
BUG=123311
TEST=sadrul@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=132294
Review URL: https://chromiumcodereview.appspot.com/10082008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index 163f43c..ecf03e4 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/test/single_monitor_manager.h" +#include "ui/aura/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,8 +40,7 @@ class NativeWidgetAuraTest : public testing::Test { // testing::Test overrides: virtual void SetUp() OVERRIDE { - aura::Env::GetInstance()->SetMonitorManager( - new aura::test::SingleMonitorManager); + aura::Env::GetInstance()->SetMonitorManager(new aura::SingleMonitorManager); root_window_.reset( aura::MonitorManager::CreateRootWindowForPrimaryMonitor()); #if defined(USE_ASH) |