Chromium Code Reviews| 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 bb123b784c7bbba18a282fccfce0b09ebb9300bc..cb287dce23e9e776a1c467baf4e25b3d534e3e49 100644 |
| --- a/blimp/client/app/linux/blimp_display_manager.h |
| +++ b/blimp/client/app/linux/blimp_display_manager.h |
| @@ -8,7 +8,8 @@ |
| #include <memory> |
| #include "base/macros.h" |
| -#include "blimp/client/feature/compositor/blimp_compositor_manager.h" |
| +#include "blimp/client/core/compositor/compositor_deps_provider.h" |
|
nyquist
2016/08/12 07:34:28
Needed?
Khushal
2016/08/13 00:03:21
Oh not anymore. Done.
|
| +#include "blimp/client/core/contents/blimp_contents_manager.h" |
| #include "ui/platform_window/platform_window_delegate.h" |
| namespace gfx { |
| @@ -21,8 +22,8 @@ class PlatformWindow; |
| namespace blimp { |
| namespace client { |
| - |
| -class BlimpCompositorManager; |
| +class BlimpContentsImpl; |
| +class CompositorDepsProvider; |
|
nyquist
2016/08/12 07:34:28
Needed?
Khushal
2016/08/13 00:03:21
Done.
|
| class RenderWidgetFeature; |
| class TabControlFeature; |
| @@ -31,8 +32,7 @@ class BlimpDisplayManagerDelegate { |
| virtual void OnClosed() = 0; |
| }; |
| -class BlimpDisplayManager : public ui::PlatformWindowDelegate, |
| - BlimpCompositorManagerClient { |
| +class BlimpDisplayManager : public ui::PlatformWindowDelegate { |
| public: |
| BlimpDisplayManager(const gfx::Size& window_size, |
| BlimpDisplayManagerDelegate* delegate, |
| @@ -54,16 +54,13 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate, |
| void OnActivationChanged(bool active) override; |
| private: |
| - // BlimpCompositorManagerClient implementation. |
| - void OnSwapBuffersCompleted() override; |
| - void DidCommitAndDrawFrame() override; |
| - |
| float device_pixel_ratio_; |
| BlimpDisplayManagerDelegate* delegate_; |
| TabControlFeature* tab_control_feature_; |
| - std::unique_ptr<BlimpCompositorManager> blimp_compositor_manager_; |
| + BlimpContentsManager blimp_contents_manager_; |
|
nyquist
2016/08/12 07:34:28
Will this become BlimpClientContext possibly in th
Khushal
2016/08/13 00:03:21
Yup. That looks like where we should be asking bli
|
| + std::unique_ptr<BlimpContentsImpl> blimp_contents_; |
| std::unique_ptr<ui::PlatformWindow> platform_window_; |
| DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager); |