Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 0c9de47752605ec5f4e1fc9d5e50589166af830e..a1dbedf41eaddfac8db476e7e1a31e075fef6de8 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -13,8 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/observer_list.h"
-#include "ui/aura/display_observer.h"
-#include "ui/aura/display_manager.h"
+#include "ui/gfx/display_observer.h"
 #include "ui/gfx/display.h"
 
 namespace aura {
@@ -68,7 +67,7 @@ struct ASH_EXPORT DisplayLayout {
 
 // DisplayController owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
-class ASH_EXPORT DisplayController : public aura::DisplayObserver {
+class ASH_EXPORT DisplayController : public gfx::DisplayObserver {
  public:
   class ASH_EXPORT Observer {
    public:
@@ -87,6 +86,9 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver {
   // object as this can be accessed after Shell is closed.
   static const gfx::Display& GetPrimaryDisplay();
 
+  // True if the primary display has been initialized.
+  static bool HasPrimaryDisplay();
+
   // Initializes primary display.
   void InitPrimaryDisplay();
 
@@ -126,7 +128,7 @@ class ASH_EXPORT DisplayController : public aura::DisplayObserver {
   std::vector<internal::RootWindowController*> GetAllRootWindowControllers();
 
   // Returns the current overscan insets for the specified |display_id|. See
-  // multi_display_manager.h for the details.
+  // display_manager.h for the details.
   gfx::Insets GetOverscanInsets(int64 display_id) const;
 
   const DisplayLayout& default_display_layout() const {