| 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 b379f6f24fddbf04c3cf5bcee08a5512569a8c67..8bb880fed4cd69788c4198cf5849d4e4fbb710af 100644
|
| --- a/blimp/client/app/linux/blimp_display_manager.h
|
| +++ b/blimp/client/app/linux/blimp_display_manager.h
|
| @@ -21,6 +21,7 @@ class PlatformWindow;
|
| namespace blimp {
|
| namespace client {
|
|
|
| +class BlimpCompositorDependencies;
|
| class BlimpCompositorManager;
|
| class BrowserCompositor;
|
| class RenderWidgetFeature;
|
| @@ -58,9 +59,9 @@ class BlimpDisplayManager : public ui::PlatformWindowDelegate {
|
| 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<BlimpCompositorManager> blimp_compositor_manager_;
|
| std::unique_ptr<ui::PlatformWindow> platform_window_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlimpDisplayManager);
|
|
|