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 /content | |
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 'content')
-rw-r--r-- | content/browser/renderer_host/test_render_view_host.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 5a8bba3..0d96498 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -21,7 +21,6 @@ #if defined(USE_AURA) #include "ui/aura/root_window.h" -#include "ui/aura/test/test_screen.h" #include "ui/aura/test/test_stacking_client.h" #endif @@ -418,7 +417,6 @@ void RenderViewHostTestHarness::Reload() { void RenderViewHostTestHarness::SetUp() { #if defined(USE_AURA) root_window_.reset(new aura::RootWindow); - gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get())); test_stacking_client_.reset( new aura::test::TestStackingClient(root_window_.get())); #endif |