diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:34:48 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-10 00:34:48 +0000 |
| commit | 49c33c2ddfe099c027bd76a172c65e28f1442bfb (patch) | |
| tree | 9cf6f597a2273dce5d776d6626ebd7b0b00928ef /ash/wm/base_layout_manager_unittest.cc | |
| parent | c9a7428436a7528c76fd03f4bf324197589b3a58 (diff) | |
| download | chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.zip chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.gz chromium_src-49c33c2ddfe099c027bd76a172c65e28f1442bfb.tar.bz2 | |
Revert 125950 - 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
Review URL: http://codereview.chromium.org/9616045
TBR=erg@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9667017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125958 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 f8045a4..b6e4901 100644 --- a/ash/wm/base_layout_manager_unittest.cc +++ b/ash/wm/base_layout_manager_unittest.cc @@ -4,7 +4,6 @@ #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" @@ -12,6 +11,7 @@ #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::GetInstance()->SetScreenWorkAreaInsets( + Shell::GetRootWindow()->SetScreenWorkAreaInsets( gfx::Insets(1, 2, 3, 4)); Shell::GetRootWindow()->SetHostSize(gfx::Size(800, 600)); aura::Window* default_container = Shell::GetInstance()->GetContainer( |