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

blimp/client/app/linux/blimp_display_manager.cc

Index: blimp/client/app/linux/blimp_display_manager.cc
diff --git a/blimp/client/app/linux/blimp_display_manager.cc b/blimp/client/app/linux/blimp_display_manager.cc
index e6f9f851465880e6c9dee6f68f771848b795afa6..1482598906d0ddb88b39aaa56b89d6bc3af75351 100644
--- a/blimp/client/app/linux/blimp_display_manager.cc
+++ b/blimp/client/app/linux/blimp_display_manager.cc
@@ -5,7 +5,7 @@
 #include "blimp/client/app/linux/blimp_display_manager.h"
 
 #include "blimp/client/core/contents/tab_control_feature.h"
-#include "blimp/client/feature/render_widget_feature.h"
+#include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/platform_window/platform_window.h"
@@ -22,15 +22,15 @@ BlimpDisplayManager::BlimpDisplayManager(
     : device_pixel_ratio_(1.f),
       delegate_(delegate),
       tab_control_feature_(tab_control_feature),
-      blimp_compositor_manager_(
-          new BlimpCompositorManager(render_widget_feature, this)),
+      blimp_contents_manager_(true, render_widget_feature),
       platform_window_(new ui::X11Window(this)) {
   platform_window_->SetBounds(gfx::Rect(window_size));
   platform_window_->Show();
   tab_control_feature_->SetSizeAndScale(platform_window_->GetBounds().size(),
                                         device_pixel_ratio_);
 
-  blimp_compositor_manager_->SetVisible(true);
+  blimp_contents_ = blimp_contents_manager_.CreateBlimpContents();
+  blimp_contents_->SetVisible(true);
 }
 
 BlimpDisplayManager::~BlimpDisplayManager() {}
@@ -47,7 +47,7 @@ void BlimpDisplayManager::DispatchEvent(ui::Event* event) {
 }
 
 void BlimpDisplayManager::OnCloseRequest() {
-  blimp_compositor_manager_->SetVisible(false);
+  blimp_contents_->SetVisible(false);
   platform_window_->Close();
 }
 
@@ -69,18 +69,14 @@ void BlimpDisplayManager::OnAcceleratedWidgetAvailable(
                                         device_pixel_ratio_);
 
   if (widget != gfx::kNullAcceleratedWidget)
-    blimp_compositor_manager_->SetAcceleratedWidget(widget);
+    blimp_contents_->SetAcceleratedWidget(widget);
 }
 
 void BlimpDisplayManager::OnAcceleratedWidgetDestroyed() {
-  blimp_compositor_manager_->ReleaseAcceleratedWidget();
+  blimp_contents_->SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }
 
 void BlimpDisplayManager::OnActivationChanged(bool active) {}
 
-void BlimpDisplayManager::OnSwapBuffersCompleted() {}
-
-void BlimpDisplayManager::DidCommitAndDrawFrame() {}
-
 }  // namespace client
 }  // namespace blimp