Move remaining Blimp feature code to core.

blimp/client/core/contents/blimp_contents_manager.h

 // Copyright 2016 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 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
 // then passes the ownership to the caller. It also owns the observers to
 // 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.
   std::unique_ptr<BlimpContentsImpl> CreateBlimpContents();
 
   // The caller can query the contents through its id.
   BlimpContentsImpl* GetBlimpContents(int id);
 
  private:
   class BlimpContentsDeletionObserver;
@@ skipping 11 matching lines @@
   // Destroy the observer entry from the observer_map_ when a BlimpContentsImpl
   // is destroyed.
   void EraseObserverFromMap(int id);
   base::WeakPtr<BlimpContentsManager> GetWeakPtr();
 
   // BlimpContentsManager owns the BlimpContentsDeletionObserver for the
   // contents it creates, with the content id being the key to help manage the
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpContentsManager);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_