[Cleanup] Screen cleanup

ash/display/display_manager.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_MANAGER_H_
 #define ASH_DISPLAY_DISPLAY_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/display.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/display/output_configurator.h"
 #endif
 
 namespace gfx {
 class Display;
 class Insets;
 class Rect;
+class Screen;
 }
 
 namespace ash {
 class AcceleratorControllerTest;
 class DisplayController;
+class ScreenAsh;
 
 namespace test {
 class DisplayManagerTestApi;
 class SystemGestureEventFilterTest;
 }
 namespace internal {
 class DisplayLayoutStore;
 
 // DisplayManager maintains the current display configurations,
 // and notifies observers when configuration changes.
@@ skipping 49 matching lines @@
       const gfx::Display& primary_display,
       int64 secondary_display_id);
 
   DisplayManager();
   virtual ~DisplayManager();
 
   DisplayLayoutStore* layout_store() {
     return layout_store_.get();
   }
 
+  gfx::Screen* screen() {
+    return screen_;
+  }
+
   void set_delegate(Delegate* delegate) { delegate_ = delegate; }
 
   // When set to true, the MonitorManager 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;
   }
 
   // Returns the display id of the first display in the outupt list.
@@ skipping 147 matching lines @@
   }
 
   // Update the bounds of the display given by |display_id|.
   bool UpdateDisplayBounds(int64 display_id,
                            const gfx::Rect& new_bounds);
 
   // Creates mirror window if the software mirror mode is enabled.
   // 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);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest,
                            NativeDisplaysChangedAfterPrimaryChange);
   FRIEND_TEST_ALL_PREFIXES(DisplayManagerTest, AutomaticOverscanInsets);
   friend class ash::AcceleratorControllerTest;
   friend class test::DisplayManagerTestApi;
   friend class test::SystemGestureEventFilterTest;
   friend class DisplayManagerTest;
@@ skipping 28 matching lines @@
   bool UpdateSecondaryDisplayBoundsForLayout(DisplayList* display_list,
                                              size_t* updated_index) const;
 
   static void UpdateDisplayBoundsForLayout(
       const DisplayLayout& layout,
       const gfx::Display& primary_display,
       gfx::Display* secondary_display);
 
   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_;
 
   // List of current active displays.
   DisplayList displays_;
 
   int num_connected_displays_;
 
   bool force_bounds_changed_;
@@ skipping 15 matching lines @@
   int64 mirrored_display_id_;
   gfx::Display non_desktop_display_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_MANAGER_H_