Migrate Linux Blimp client to use BlimpClientContext

blimp/client/app/linux/blimp_display_manager.h

 // Copyright 2015 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_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
 #define BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "ui/events/event.h"
 #include "ui/events/gestures/motion_event_aura.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 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;
 };
 
 class BlimpDisplayManager : public ui::PlatformWindowDelegate {

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

Can we add a descriptive comment for this class?

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

Done.

  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.

   void OnBoundsChanged(const gfx::Rect& new_bounds) override;
   void OnDamageRect(const gfx::Rect& damaged_region) override {}
   void DispatchEvent(ui::Event* event) override;
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override {}
   void OnLostCapture() override {}
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
                                     float device_pixel_ratio) override;
   void OnAcceleratedWidgetDestroyed() override;
@@ skipping 12 matching lines @@
                                int pointer_id,
                                int pointer_x,
                                int pointer_y);
 
   // Simulate a pinch/zoom touch event.
   void Zoom(int pointer_x, int pointer_y, int y_offset, bool zoom_out);
 
   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);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_APP_LINUX_BLIMP_DISPLAY_MANAGER_H_