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..7246b4ea27a3cd9b61d7921cd5cce2422f1f1d4b 100644
--- a/blimp/client/app/linux/blimp_display_manager.h
+++ b/blimp/client/app/linux/blimp_display_manager.h
@@ -17,32 +17,38 @@ class Size;
 }
 
 namespace ui {
+class PlatformEventSource;
 class PlatformWindow;
 }
 
 namespace blimp {
 namespace client {
 
-class BlimpCompositorDependencies;
-class BlimpCompositorManager;
 class BrowserCompositor;
-class RenderWidgetFeature;
-class TabControlFeature;
+class BlimpContents;
+class CompositorDependencies;
 
 class BlimpDisplayManagerDelegate {
  public:
   virtual void OnClosed() = 0;
 };
 
+// Manages an X11 window that interacts with a Compositor by listening to the
+// window's event handlers
 class BlimpDisplayManager : public ui::PlatformWindowDelegate {
  public:
-  BlimpDisplayManager(const gfx::Size& window_size,
-                      BlimpDisplayManagerDelegate* delegate,
-                      RenderWidgetFeature* render_widget_feature,
-                      TabControlFeature* tab_control_feature);
+  BlimpDisplayManager(

[Kevin M, 2016/09/28 01:35:46]

Document the parameters before the constructor declaration vs. doing them
inline.

// |window_size|: Size of the X11 window
// |delegate|: The delegate to receive the
//             OnClosed call.
// ...
BlimpDisplayManager(...);

[steimel, 2016/09/28 20:33:07]

Done.

+      const gfx::Size& window_size,  // size of X11 window
+      BlimpDisplayManagerDelegate*
+          delegate,  // delegate to receive OnClosed call
+      CompositorDependencies* compositor_dependencies,  // Set of compositor
+                                                        // dependencies provided
+                                                        // by the embedder
+      std::unique_ptr<BlimpContents>
+          contents);  // Responsible for rendering web pages
   ~BlimpDisplayManager() override;
 
-  // ui::PlatformWindowDelegate:
+  // ui::PlatformWindowDelegate implementation.
   void OnBoundsChanged(const gfx::Rect& new_bounds) override;
   void OnDamageRect(const gfx::Rect& damaged_region) override {}
   void DispatchEvent(ui::Event* event) override;
@@ -75,11 +81,10 @@ 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::PlatformEventSource> platform_event_source_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager);