[Cleanup] Screen cleanup

ash/display/display_manager.h

Index: ash/display/display_manager.h
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index 4e03f336a85b01de798f6745747d6c5cf1d2d342..94cac2d251fc22a000ae8506d140dc7ced16b1c9 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -24,11 +24,13 @@ namespace gfx {
 class Display;
 class Insets;
 class Rect;
+class Screen;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
 class DisplayController;
+class ScreenAsh;
 
 namespace test {
 class DisplayManagerTestApi;
@@ -98,6 +100,10 @@ class ASH_EXPORT DisplayManager
     return layout_store_.get();
   }
 
+  gfx::Screen* screen() {
+    return screen_;
+  }
+
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
   // When set to true, the MonitorManager calls OnDisplayBoundsChanged
@@ -265,6 +271,9 @@ class ASH_EXPORT DisplayManager
   // This is used only for bootstrap.
   void CreateMirrorWindowIfAny();
 
+  // Create a screen instance that can be used during shutdown.
+  gfx::Screen* CreateScreenForShutdown() const;
+
 private:
   FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, ConvertPoint);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, TestNativeDisplaysChanged);
@@ -313,6 +322,10 @@ private:
 
   Delegate* delegate_;  // not owned.
 
+  scoped_ptr<ScreenAsh> screen_ash_;
+  // This is to have an accessor without ScreenAsh definition.
+  gfx::Screen* screen_;

[Jun Mukai, 2014/01/15 19:20:15]

Can we just put #include "ash/display/screen_ash.h" instead of forward
declarations so that it knows ScreenAsh is a subclass of gfx::Screen?  Then you
don't have to do such trick.

[oshima, 2014/01/15 19:42:51]

I don't like exposing unnecessary implementation details in header. We do
something similar to focus/acivation controller. If you really don't like this,
I'll add internal accessor in .cc. Please let me know.

[Jun Mukai, 2014/01/15 19:46:00]

okay, it's up to you.

+
   scoped_ptr<DisplayLayoutStore> layout_store_;
 
   int64 first_display_id_;