Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/test/test_screen.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_TEST_TEST_SCREEN_H_
 #define UI_AURA_TEST_TEST_SCREEN_H_
 
 #include "base/compiler_specific.h"
+#include "ui/aura/window_observer.h"
+#include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
+namespace gfx {
+class Rect;
+}
+
 namespace aura {
 class RootWindow;
+class Window;
 
 // A minimal, testing Aura implementation of gfx::Screen.
-class TestScreen : public gfx::Screen {
+class TestScreen : public gfx::Screen,
+                   public WindowObserver {
  public:
-  explicit TestScreen(aura::RootWindow* root_window);
+  TestScreen();
   virtual ~TestScreen();
 
+  RootWindow* CreateRootWindowForPrimaryDisplay();
+
  protected:
+  // WindowObserver overrides:
+  virtual void OnWindowBoundsChanged(Window* window,
+                                     const gfx::Rect& old_bounds,
+                                     const gfx::Rect& new_bounds) OVERRIDE;
+  virtual void OnWindowDestroying(Window* window) OVERRIDE;
+
   // gfx::Screen overrides:
   virtual bool IsDIPEnabled() OVERRIDE;
   virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
   virtual gfx::NativeWindow GetWindowAtCursorScreenPoint() OVERRIDE;
   virtual int GetNumDisplays() OVERRIDE;
   virtual gfx::Display GetDisplayNearestWindow(
       gfx::NativeView view) const OVERRIDE;
   virtual gfx::Display GetDisplayNearestPoint(
       const gfx::Point& point) const OVERRIDE;
   virtual gfx::Display GetDisplayMatching(
       const gfx::Rect& match_rect) const OVERRIDE;
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE;
+  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
 
  private:
-  gfx::Display GetMonitor() const;
+  aura::RootWindow* root_window_;
 
-  aura::RootWindow* root_window_;
+  gfx::Display display_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScreen);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_SCREEN_H_