blimp: Move compositing, input and render widget feature to client/core.

blimp/client/app/linux/blimp_display_manager.h

Index: blimp/client/app/linux/blimp_display_manager.h
diff --git a/blimp/client/app/linux/blimp_display_manager.h b/blimp/client/app/linux/blimp_display_manager.h
index bb123b784c7bbba18a282fccfce0b09ebb9300bc..defd268645dd57643aa5945b3c75ec280c819867 100644
--- a/blimp/client/app/linux/blimp_display_manager.h
+++ b/blimp/client/app/linux/blimp_display_manager.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "blimp/client/feature/compositor/blimp_compositor_manager.h"
+#include "blimp/client/core/contents/blimp_contents_manager.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace gfx {
@@ -21,8 +21,7 @@ class PlatformWindow;
 
 namespace blimp {
 namespace client {
-
-class BlimpCompositorManager;
+class BlimpContentsImpl;
 class RenderWidgetFeature;
 class TabControlFeature;
 
@@ -31,8 +30,7 @@ class BlimpDisplayManagerDelegate {
   virtual void OnClosed() = 0;
 };
 
-class BlimpDisplayManager : public ui::PlatformWindowDelegate,
-                            BlimpCompositorManagerClient {
+class BlimpDisplayManager : public ui::PlatformWindowDelegate {
  public:
   BlimpDisplayManager(const gfx::Size& window_size,
                       BlimpDisplayManagerDelegate* delegate,
@@ -54,16 +52,13 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate,
   void OnActivationChanged(bool active) override;
 
  private:
-  // BlimpCompositorManagerClient implementation.
-  void OnSwapBuffersCompleted() override;
-  void DidCommitAndDrawFrame() override;
-
   float device_pixel_ratio_;
 
   BlimpDisplayManagerDelegate* delegate_;
   TabControlFeature* tab_control_feature_;
 
-  std::unique_ptr<BlimpCompositorManager> blimp_compositor_manager_;
+  BlimpContentsManager blimp_contents_manager_;
+  std::unique_ptr<BlimpContentsImpl> blimp_contents_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager);