Pull parts of TopLevelDisplayClient into DisplayCompositor

components/mus/ws/platform_display.h

 // Copyright 2014 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_PLATFORM_DISPLAY_H_
 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 31 matching lines @@
 namespace ui {
 class CursorLoader;
 class PlatformWindow;
 struct TextInputState;
 }  // namespace ui
 
 namespace mus {
 
 class GpuState;
 class SurfacesState;
-class TopLevelDisplayClient;
+class DisplayCompositor;
 
 namespace ws {
 
 class EventDispatcher;
 class PlatformDisplayFactory;
 class ServerWindow;
 
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 class PlatformDisplay {
  public:
@@ skipping 97 matching lines @@
   shell::Connector* connector_;
   scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   PlatformDisplayDelegate* delegate_;
 
   mojom::ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
-  std::unique_ptr<TopLevelDisplayClient> top_level_display_client_;
+  std::unique_ptr<DisplayCompositor> display_compositor_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
 #if !defined(OS_ANDROID)
   std::unique_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_