Move remaining Blimp feature code to core.

blimp/client/core/contents/blimp_contents_manager.h

Index: blimp/client/core/contents/blimp_contents_manager.h
diff --git a/blimp/client/core/contents/blimp_contents_manager.h b/blimp/client/core/contents/blimp_contents_manager.h
index 9b58e76186bb9cd19145a2b6161ca04b2639c05f..c55b9f5480f9b3abf555132d04b72367e3001eeb 100644
--- a/blimp/client/core/contents/blimp_contents_manager.h
+++ b/blimp/client/core/contents/blimp_contents_manager.h
@@ -5,11 +5,20 @@
 #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_
 #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_
 
-#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include <map>

[Khushal, 2016/08/31 04:30:47]

Do you need these?

[David Trainor- moved to gerrit, 2016/08/31 05:21:27]

Done.

+#include <memory>
+
+#include "base/memory/weak_ptr.h"
 
 namespace blimp {
 namespace client {
 
+class BlimpCompositorDependencies;
+class BlimpContents;
+class BlimpContentsImpl;
+class ImeFeature;
+class NavigationFeature;
+class RenderWidgetFeature;
 class TabControlFeature;
 
 // BlimpContentsManager does the real work of creating BlimpContentsImpl, and
@@ -17,9 +26,12 @@ class TabControlFeature;
 // monitor the life time of the contents it creates.
 class BlimpContentsManager {
  public:
-  explicit BlimpContentsManager(ImeFeature* ime_feature,
-                                NavigationFeature* nav_feature,
-                                TabControlFeature* tab_control_feature);
+  explicit BlimpContentsManager(
+      BlimpCompositorDependencies* blimp_compositor_dependencies,
+      ImeFeature* ime_feature,
+      NavigationFeature* nav_feature,
+      RenderWidgetFeature* render_widget_feature,
+      TabControlFeature* tab_control_feature);
   ~BlimpContentsManager();
 
   // Builds a BlimpContentsImpl and notifies the engine.
@@ -51,8 +63,10 @@ class BlimpContentsManager {
   // lifetime of the observers.
   std::map<int, std::unique_ptr<BlimpContentsDeletionObserver>> observer_map_;
 
+  BlimpCompositorDependencies* blimp_compositor_dependencies_;
   ImeFeature* ime_feature_;
   NavigationFeature* navigation_feature_;
+  RenderWidgetFeature* render_widget_feature_;
   TabControlFeature* tab_control_feature_;
 
   base::WeakPtrFactory<BlimpContentsManager> weak_ptr_factory_;