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

blimp/client/app/android/blimp_view.h

Index: blimp/client/app/android/blimp_view.h
diff --git a/blimp/client/app/android/blimp_view.h b/blimp/client/app/android/blimp_view.h
index 8bab0f344de2855d0a0f1a683cbba56d291fda13..6c52eadd837be0533a60b86a9909a99960be09e8 100644
--- a/blimp/client/app/android/blimp_view.h
+++ b/blimp/client/app/android/blimp_view.h
@@ -9,7 +9,8 @@
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
-#include "blimp/client/app/android/blimp_compositor_manager_android.h"
+#include "base/memory/weak_ptr.h"
+#include "blimp/client/core/contents/blimp_contents_manager.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
@@ -20,13 +21,13 @@ namespace blimp {
 class BlimpConnectionStatistics;
 
 namespace client {
-
+class BlimpContents;
 class RenderWidgetFeature;
 
 // The native component of org.chromium.blimp.BlimpView.  This builds and
 // maintains a BlimpCompositorAndroid and handles notifying the compositor of
 // SurfaceView surface changes (size, creation, destruction, etc.).
-class BlimpView : public BlimpCompositorManagerClient {
+class BlimpView {
  public:
   static bool RegisterJni(JNIEnv* env);
 
@@ -94,17 +95,15 @@ class BlimpView : public BlimpCompositorManagerClient {
   virtual ~BlimpView();
 
   void ReleaseAcceleratedWidget();
-
-  // BlimpCompositorManagerClient implementation.
-  void OnSwapBuffersCompleted() override;
-  void DidCommitAndDrawFrame() override;
+  void OnSwapBuffersCompleted();
 
   // Reference to the Java object which owns this class.
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
   const float device_scale_factor_;
 
-  std::unique_ptr<BlimpCompositorManagerAndroid> compositor_manager_;
+  BlimpContentsManager blimp_contents_manager_;
+  std::unique_ptr<BlimpContentsImpl> blimp_contents_;
 
   // The format of the current surface owned by |compositor_|.  See
   // android.graphics.PixelFormat.java.
@@ -112,7 +111,8 @@ class BlimpView : public BlimpCompositorManagerClient {
 
   gfx::AcceleratedWidget window_;
 
-  BlimpConnectionStatistics* blimp_connection_statistics_;
+  // BlimpConnectionStatistics* blimp_connection_statistics_;
+  base::WeakPtrFactory<BlimpView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpView);
 };