diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 21:09:17 +0000 |
| commit | 1a2145b860591d2e868ab98147ea4f162636d7eb (patch) | |
| tree | 26a65524e4698ffc4b76eeb3409bbd0fca2ae238 /ash/wm/base_layout_manager_unittest.cc | |
| parent | 73238e09cc56e8b1b599ec978bec7bdd7a7730a8 (diff) | |
| download | chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.zip chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.gz chromium_src-1a2145b860591d2e868ab98147ea4f162636d7eb.tar.bz2 | |
Recommit r125950, which was reverted by r125958 due to link failures on win_aura bot.
Aura/Ash split: Move ScreenAura to aura::RootWindowScreen.
What is now aura::RootWindowScreen was tightly bundled with aura::RootWindow. Instead of moving it to ash::ScreenAsh, I renamed it aurea::RootWindowScreen because there's a bunch of unit tests that use RootWindow as if it were the desktop. Screen integration stuff has been moved out of RootWindow (and related observers) and into ash::Shell.
BUG=116458
First Review URL: http://codereview.chromium.org/9616045
Review URL: http://codereview.chromium.org/9696008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/base_layout_manager_unittest.cc')
| -rw-r--r-- | ash/wm/base_layout_manager_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/base_layout_manager_unittest.cc b/ash/wm/base_layout_manager_unittest.cc index b6e4901..f8045a4 100644 --- a/ash/wm/base_layout_manager_unittest.cc +++ b/ash/wm/base_layout_manager_unittest.cc @@ -4,6 +4,7 @@ #include "ash/wm/base_layout_manager.h" +#include "ash/screen_ash.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" @@ -11,7 +12,6 @@ #include "base/compiler_specific.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" -#include "ui/aura/screen_aura.h" #include "ui/aura/test/test_windows.h" #include "ui/base/ui_base_types.h" #include "ui/aura/window.h" @@ -27,7 +27,7 @@ class BaseLayoutManagerTest : public test::AshTestBase { virtual void SetUp() OVERRIDE { test::AshTestBase::SetUp(); - Shell::GetRootWindow()->SetScreenWorkAreaInsets( + Shell::GetInstance()->SetScreenWorkAreaInsets( gfx::Insets(1, 2, 3, 4)); Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600)); aura::Window* default_container = Shell::GetInstance()->GetContainer( |