Migrate Linux Blimp client to use BlimpClientContext

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 426ae4455d30667f54c4e4fb467d4b31f664f321..f1bb567174ccba55550071a364f883ee400c3bcb 100644
--- a/blimp/client/app/linux/blimp_display_manager.h
+++ b/blimp/client/app/linux/blimp_display_manager.h
@@ -23,11 +23,9 @@ class PlatformWindow;
 namespace blimp {
 namespace client {
 
-class BlimpCompositorDependencies;
-class BlimpCompositorManager;
 class BrowserCompositor;
-class RenderWidgetFeature;
-class TabControlFeature;
+class BlimpContents;
+class CompositorDependencies;
 
 class BlimpDisplayManagerDelegate {
  public:
@@ -38,8 +36,8 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate {
  public:
   BlimpDisplayManager(const gfx::Size& window_size,

[Kevin M, 2016/09/27 21:59:41]

Comment on ctor parameters

[steimel, 2016/09/27 23:23:19]

Done.

                       BlimpDisplayManagerDelegate* delegate,
-                      RenderWidgetFeature* render_widget_feature,
-                      TabControlFeature* tab_control_feature);
+                      CompositorDependencies* compositor_dependencies,
+                      std::unique_ptr<BlimpContents> contents);
   ~BlimpDisplayManager() override;
 
   // ui::PlatformWindowDelegate:

[Kevin M, 2016/09/27 21:59:41]

"... implementation."

[steimel, 2016/09/27 23:23:19]

Done.

@@ -75,11 +73,9 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate {
   float device_pixel_ratio_;
 
   BlimpDisplayManagerDelegate* delegate_;
-  TabControlFeature* tab_control_feature_;
 
-  std::unique_ptr<BlimpCompositorDependencies> compositor_dependencies_;
-  std::unique_ptr<BlimpCompositorManager> compositor_manager_;
   std::unique_ptr<BrowserCompositor> compositor_;
+  std::unique_ptr<BlimpContents> contents_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager);