[Cleanup] Screen cleanup

ash/display/screen_ash.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_SCREEN_ASH_H_
-#define ASH_SCREEN_ASH_H_
+#ifndef ASH_DISPLAY_SCREEN_ASH_H_
+#define ASH_DISPLAY_SCREEN_ASH_H_
 
 #include "ash/ash_export.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "ui/gfx/screen.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ash {
+namespace  internal {
+class DisplayManager;
+}
 
 // Aura implementation of gfx::Screen. Implemented here to avoid circular
 // dependencies.
 class ASH_EXPORT ScreenAsh : public gfx::Screen {
  public:
   ScreenAsh();
   virtual ~ScreenAsh();
 
   // Finds the display that contains |point| in screeen coordinates.
   // Returns invalid display if there is no display that can satisfy
@@ skipping 21 matching lines @@
                                          const gfx::Rect& rect);
 
   // Returns a gfx::Display object for secondary display. Returns
   // invalid display if there is no secondary display connected.
   static const gfx::Display& GetSecondaryDisplay();
 
   // Returns a gfx::Display object for the specified id.  Returns
   // 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:
+  friend class Shell;

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

I don't think Shell is necessarily a friend class.

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

Thank you for the catch. removed.

+  friend class internal::DisplayManager;
+
+  // Notifies observers of display configuration changes.
+  void NotifyBoundsChanged(const gfx::Display& display);
+  void NotifyDisplayAdded(const gfx::Display& display);
+  void NotifyDisplayRemoved(const gfx::Display& display);
+
+  // Creates a screen that can be used during shutdown.
+  // It simply has a copy of the displays.
+  gfx::Screen* CloneForShutdown();
+
   ObserverList<gfx::DisplayObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenAsh);
 };
 
 }  // namespace ash
 
-#endif  // ASH_SCREEN_ASH_H_
+#endif  // ASH_DISPLAY_SCREEN_ASH_H_