Refators display related functionality into own class

components/mus/ws/display.h

 // Copyright 2015 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 COMPONENTS_MUS_WS_DISPLAY_H_
 #define COMPONENTS_MUS_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 14 matching lines @@
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/server_window_tracker.h"
 #include "components/mus/ws/user_id_tracker_observer.h"
 #include "components/mus/ws/window_manager_factory_registry_observer.h"
 
 namespace mus {
 namespace ws {
 
 class ConnectionManager;
 class DisplayBinding;
+class DisplayManager;
 class FocusController;
 class WindowManagerState;
 class WindowTree;
 
 namespace test {
 class DisplayTestApi;
 }
 
 // Displays manages the state associated with a single display. Display has a
 // single root window whose children are the roots for a per-user
@@ skipping 27 matching lines @@
   void Init(scoped_ptr<DisplayBinding> binding);
 
   uint32_t id() const { return id_; }
 
   // TODO(sky): move to WMM.
   void SetFrameDecorationValues(mojom::FrameDecorationValuesPtr values);
   const mojom::FrameDecorationValues& frame_decoration_values() const {
     return *frame_decoration_values_;
   }
 
-  // Schedules a paint for the specified region in the coordinates of |window|
-  // if the |window| is in this viewport. Returns whether |window| is in the
-  // viewport.
-  bool SchedulePaintIfInViewport(const ServerWindow* window,
-                                 const gfx::Rect& bounds);
+  // Schedules a paint for the specified region in the coordinates of |window|.
+  void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds);
 
   // Schedules destruction of surfaces in |window|. If a frame has been
   // scheduled but not drawn surface destruction is delayed until the frame is
   // drawn, otherwise destruction is immediate.
   void ScheduleSurfaceDestruction(ServerWindow* window);
 
   // Returns the metrics for this viewport.
   const mojom::ViewportMetrics& GetViewportMetrics() const;
 
   mojom::Rotation GetRotation() const;
@@ skipping 32 matching lines @@
   void SetImeVisibility(ServerWindow* window, bool visible);
 
   // Returns the window that has captured input.
   ServerWindow* GetCaptureWindow() {
     return event_dispatcher_.capture_window();
   }
   const ServerWindow* GetCaptureWindow() const {
     return event_dispatcher_.capture_window();
   }
 
-  // Called just before |tree| is destroyed after its connection encounters an
-  // error.
-  void OnWindowTreeConnectionError(WindowTree* tree);
+  // Called just before |tree| is destroyed.
+  void OnWillDestroyTree(WindowTree* tree);
 
   // Called when a client updates a cursor. This will update the cursor on the
   // native display if the cursor is currently under |window|.
   void OnCursorUpdated(ServerWindow* window);
 
   // Called when the window tree when stacking and bounds of a window
   // change. This may update the cursor if the ServerWindow under the last
   // known pointer location changed.
   void MaybeChangeCursorOnWindowTreeChange();
 
@@ skipping 22 matching lines @@
     QueuedEvent();
     ~QueuedEvent();
 
     scoped_ptr<ui::Event> event;
     scoped_ptr<ProcessedEventTarget> processed_target;
   };
 
   // Inits the necessary state once the display is ready.
   void InitWindowManagersIfNecessary();
 
+  DisplayManager* display_manager();
+  const DisplayManager* display_manager() const;
+
   void OnEventAckTimeout();
 
   // Schedules an event to be processed later.
   void QueueEvent(const ui::Event& event,
                   scoped_ptr<ProcessedEventTarget> processed_event_target);
 
   // Processes the next valid event in |event_queue_|. If the event has already
   // been processed it is dispatched, otherwise the event is passed to the
   // EventDispatcher for processing.
   void ProcessNextEventFromQueue();
@@ skipping 82 matching lines @@
 
   mojom::FrameDecorationValuesPtr frame_decoration_values_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_DISPLAY_H_