[Cleanup] Screen cleanup

ash/screen_util.h

Index: ash/screen_util.h
diff --git a/ash/screen_ash.h b/ash/screen_util.h
similarity index 53%
rename from ash/screen_ash.h
rename to ash/screen_util.h
index 6c076075e6ad13209b82a6e67968ff445118aeb6..882ee051f90bfd59a1c71613ad3d1921eca0e19c 100644
--- a/ash/screen_ash.h
+++ b/ash/screen_util.h
@@ -2,27 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SCREEN_ASH_H_
-#define ASH_SCREEN_ASH_H_
+#ifndef ASH_SCREEN_UTIL_H_
+#define ASH_SCREEN_UTIL_H_
 
 #include "ash/ash_export.h"
-#include "base/compiler_specific.h"
-#include "base/observer_list.h"
-#include "ui/gfx/screen.h"
+#include "base/basictypes.h"
+
+namespace aura {
+class Window;
+}
 
 namespace gfx {
+class Display;
 class Rect;
+class Point;
 }
 
 namespace ash {
 
-// Aura implementation of gfx::Screen. Implemented here to avoid circular
-// dependencies.
-class ASH_EXPORT ScreenAsh : public gfx::Screen {
+class ASH_EXPORT ScreenUtil {
  public:
-  ScreenAsh();
-  virtual ~ScreenAsh();
-
   // Finds the display that contains |point| in screeen coordinates.
   // Returns invalid display if there is no display that can satisfy
   // the condition.
@@ -38,6 +37,7 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
   // Returns the display's work area bounds in parent coordinates.
   static gfx::Rect GetDisplayWorkAreaBoundsInParent(aura::Window* window);
 
+  // TODO(oshima): Move following two to wm/coordinate_conversion.h
   // Converts |rect| from |window|'s coordinates to the virtual screen
   // coordinates.
   static gfx::Rect ConvertRectToScreen(aura::Window* window,
@@ -56,36 +56,13 @@ class ASH_EXPORT ScreenAsh : public gfx::Screen {
   // invalid display if no such display is connected.
   static const gfx::Display& GetDisplayForId(int64 display_id);
 
-  // Notifies observers of display configuration changes.
-  void NotifyBoundsChanged(const gfx::Display& display);
-  void NotifyDisplayAdded(const gfx::Display& display);
-  void NotifyDisplayRemoved(const gfx::Display& display);
-
- protected:
-  // gfx::Screen overrides:
-  virtual bool IsDIPEnabled() OVERRIDE;
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE;
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE;
-  virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point)
-      OVERRIDE;
-  virtual int GetNumDisplays() const OVERRIDE;
-  virtual std::vector<gfx::Display> GetAllDisplays() const 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:
-  ObserverList<gfx::DisplayObserver> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
+private:
+  ScreenUtil() {}
+  ~ScreenUtil() {}
+
+  DISALLOW_COPY_AND_ASSIGN(ScreenUtil);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SCREEN_ASH_H_
+#endif  // ASH_SCREEN_UTIL_H_