Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/display/display_controller.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 ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONTROLLER_H_
 
 #include <map>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #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 {
 class Display;
 class RootWindow;
 }
 
 namespace base {
 class Value;
 template <typename T> class JSONValueConverter;
@@ skipping 33 matching lines @@
   // The offset of the position of the secondary display.  The offset is
   // based on the top/left edge of the primary display.
   int offset;
 
   // Returns string representation of the layout for debugging/testing.
   std::string ToString() const;
 };
 
 // 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:
     // Invoked when the display configuration change is requested,
     // but before the change is applied to aura/ash.
     virtual void OnDisplayConfigurationChanging() = 0;
 
    protected:
     virtual ~Observer() {}
   };
@@ skipping 37 matching lines @@
 
   // Returns all root windows. In non extended desktop mode, this
   // returns the primary root window only.
   std::vector<aura::RootWindow*> GetAllRootWindows();
 
   // Returns all oot window controllers. In non extended desktop
   // mode, this return a RootWindowController for the primary root window only.
   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 {
     return default_display_layout_;
   }
   void SetDefaultDisplayLayout(const DisplayLayout& layout);
 
   // Sets/gets the display layout for the specified display or display
   // name.  Getter returns the default value in case it doesn't have
   // its own layout yet.
@@ skipping 33 matching lines @@
   int64 desired_primary_display_id_;
 
   ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_