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

1 files changed, 0 insertions, 16 deletions

diff --git a/ash/shell.h b/ash/shell.h
index e6af0db..92910ce 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -14,9 +14,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/observer_list.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/insets.h"
 
 class CommandLine;
 
@@ -47,9 +45,7 @@ class NestedDispatcherController;
 class NetworkController;
 class PowerButtonController;
 class PowerStatusController;
-class ScreenAsh;
 class ShellDelegate;
-class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
 class VideoDetector;
@@ -156,13 +152,6 @@ class ASH_EXPORT Shell {
   // Rotate focus through containers that can receive focus.
   void RotateFocus(Direction direction);
 
-  // Sets the screen's work area insets, this notifies observers too.
-  void SetScreenWorkAreaInsets(const gfx::Insets& insets);
-
-  // Add/remove observer.
-  void AddShellObserver(ShellObserver* observer);
-  void RemoveShellObserver(ShellObserver* observer);
-
 #if !defined(OS_MACOSX)
   AcceleratorController* accelerator_controller() {
     return accelerator_controller_.get();
@@ -208,8 +197,6 @@ class ASH_EXPORT Shell {
 
   Launcher* launcher() { return launcher_.get(); }
 
-  const ScreenAsh* screen() { return screen_; }
-
   internal::ShelfLayoutManager* shelf() const { return shelf_; }
 
   SystemTray* tray() const { return tray_.get(); }
@@ -247,7 +234,6 @@ class ASH_EXPORT Shell {
   static bool initially_hide_cursor_;
 
   scoped_ptr<aura::RootWindow> root_window_;
-  ScreenAsh* screen_;
 
   internal::RootWindowEventFilter* root_filter_;  // not owned
 
@@ -302,8 +288,6 @@ class ASH_EXPORT Shell {
   // the status area.
   internal::ShelfLayoutManager* shelf_;
 
-  ObserverList<ShellObserver> observers_;
-
   // Can change at runtime.
   BackgroundMode desktop_background_mode_;