Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/display/multi_display_manager.h

Index: ash/display/multi_display_manager.h
diff --git a/ash/display/multi_display_manager.h b/ash/display/multi_display_manager.h
deleted file mode 100644
index 40b9f30db3d91f32104ff8617420587065a66f8f..0000000000000000000000000000000000000000
--- a/ash/display/multi_display_manager.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// 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_MULTI_DISPLAY_MANAGER_H_
-#define ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_
-
-#include <string>
-#include <vector>
-
-#include "ash/ash_export.h"
-#include "base/compiler_specific.h"
-#include "base/gtest_prod_util.h"
-#include "ui/aura/display_manager.h"
-#include "ui/aura/root_window_observer.h"
-#include "ui/aura/window.h"
-
-namespace gfx {
-class Display;
-class Insets;
-class Rect;
-}
-
-namespace ash {
-class AcceleratorControllerTest;
-namespace test {
-class MultiDisplayManagerTestApi;
-class SystemGestureEventFilterTest;
-}
-namespace internal {
-
-// MultiDisplayManager maintains the current display configurations,
-// and notifies observers when configuration changes.
-// This is exported for unittest.
-//
-// TODO(oshima): gfx::Screen needs to return translated coordinates
-// if the root window is translated. crbug.com/119268.
-class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
-                                       public aura::RootWindowObserver {
- public:
-  MultiDisplayManager();
-  virtual ~MultiDisplayManager();
-
-  // Used to emulate display change when run in a desktop environment instead
-  // of on a device.
-  static void CycleDisplay();
-  static void ToggleDisplayScale();
-
-  // When set to true, the MultiMonitorManager calls OnDisplayBoundsChanged
-  // even if the display's bounds didn't change. Used to swap primary
-  // display.
-  void set_force_bounds_changed(bool force_bounds_changed) {
-    force_bounds_changed_ = force_bounds_changed;
-  }
-
-  // True if the given |display| is currently connected.
-  bool IsActiveDisplay(const gfx::Display& display) const;
-
-  // True if there is an internal display.
-  bool HasInternalDisplay() const;
-
-  bool IsInternalDisplayId(int64 id) const;
-
-  bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
-                                            const gfx::Insets& insets);
-
-  // Returns display for given |id|;
-  const gfx::Display& GetDisplayForId(int64 id) const;
-
-  // Finds the display that contains |point| in screeen coordinates.
-  // Returns invalid display if there is no display that can satisfy
-  // the condition.
-  const gfx::Display& FindDisplayContainingPoint(
-      const gfx::Point& point_in_screen) const;
-
-  // Registers the overscan insets for the display of the specified ID. Note
-  // that the insets size should be specified in DIP size. It also triggers the
-  // display's bounds change.
-  void SetOverscanInsets(int64 display_id, const gfx::Insets& insets_in_dip);
-
-  // Returns the current overscan insets for the specified |display_id|.
-  // Returns an empty insets (0, 0, 0, 0) if no insets are specified for
-  // the display.
-  gfx::Insets GetOverscanInsets(int64 display_id) const;
-
-  // DisplayManager overrides:
-  virtual void OnNativeDisplaysChanged(
-      const std::vector<gfx::Display>& displays) OVERRIDE;
-  virtual aura::RootWindow* CreateRootWindowForDisplay(
-      const gfx::Display& display) OVERRIDE;
-  virtual gfx::Display* GetDisplayAt(size_t index) OVERRIDE;
-
-  virtual size_t GetNumDisplays() const OVERRIDE;
-  virtual const gfx::Display& GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE;
-  virtual const gfx::Display& GetDisplayNearestWindow(
-      const aura::Window* window) const OVERRIDE;
-  virtual const gfx::Display& GetDisplayMatching(
-      const gfx::Rect& match_rect)const OVERRIDE;
-  virtual std::string GetDisplayNameFor(const gfx::Display& display) OVERRIDE;
-
-  // RootWindowObserver overrides:
-  virtual void OnRootWindowResized(const aura::RootWindow* root,
-                                   const gfx::Size& new_size) OVERRIDE;
-
- private:
-  FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
-  FRIEND_TEST_ALL_PREFIXES(MultiDisplayManagerTest, TestNativeDisplaysChanged);
-  FRIEND_TEST_ALL_PREFIXES(MultiDisplayManagerTest,
-                           NativeDisplaysChangedAfterPrimaryChange);
-  friend class ash::AcceleratorControllerTest;
-  friend class test::MultiDisplayManagerTestApi;
-  friend class MultiDisplayManagerTest;
-  friend class test::SystemGestureEventFilterTest;
-
-  typedef std::vector<gfx::Display> DisplayList;
-
-  void Init();
-  void CycleDisplayImpl();
-  void ScaleDisplayImpl();
-
-  gfx::Display& FindDisplayForRootWindow(const aura::RootWindow* root);
-  gfx::Display& FindDisplayForId(int64 id);
-
-  // Refer to |aura::DisplayManager::CreateDisplayFromSpec| API for
-  // the format of |spec|.
-  void AddDisplayFromSpec(const std::string& spec);
-
-  // Set the 1st display as an internal display and returns the display Id for
-  // the internal display.
-  int64 SetFirstDisplayAsInternalDisplayForTest();
-
-  // Checks if the mouse pointer is on one of displays, and moves to
-  // the center of the nearest display if it's outside of all displays.
-  void EnsurePointerInDisplays();
-
-  // Updates |display_names_| by calling platform-dependent functions.
-  void RefreshDisplayNames();
-
-  // Update the display's id in the |display_list| to match the ones
-  // stored in this display manager's |displays_|. This is used to
-  // emulate display change behavior during the test byn creating the
-  // display list with the same display ids but with different bounds
-  void SetDisplayIdsForTest(DisplayList* display_list) const;
-
-  DisplayList displays_;
-
-  int64 internal_display_id_;
-
-  // An internal display cache used when the internal display is disconnectd.
-  scoped_ptr<gfx::Display> internal_display_;
-
-  bool force_bounds_changed_;
-
-  // The mapping from the display ID to its overscan insets.
-  std::map<int64, gfx::Insets> overscan_mapping_;
-
-  // The cached display's name for the display ID.
-  std::map<int64, std::string> display_names_;
-
-  DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);
-};
-
-extern const aura::WindowProperty<int64>* const kDisplayIdKey;
-
-}  // namespace internal
-}  // namespace ash
-
-#endif  // ASH_DISPLAY_MULTI_DISPLAY_MANAGER_H_