| Index: blimp/client/core/contents/blimp_contents_manager.h
|
| diff --git a/blimp/client/core/contents/blimp_contents_manager.h b/blimp/client/core/contents/blimp_contents_manager.h
|
| index ea70960ffbccffc7eb48072e9d5784c2de681fab..c27dde325d7f85f2d5e6a22d530cf8304eb3be37 100644
|
| --- a/blimp/client/core/contents/blimp_contents_manager.h
|
| +++ b/blimp/client/core/contents/blimp_contents_manager.h
|
| @@ -5,17 +5,20 @@
|
| #ifndef BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_
|
| #define BLIMP_CLIENT_CORE_CONTENTS_BLIMP_CONTENTS_MANAGER_H_
|
|
|
| +#include "blimp/client/core/compositor/compositor_deps_provider.h"
|
| #include "blimp/client/core/contents/blimp_contents_impl.h"
|
|
|
| namespace blimp {
|
| namespace client {
|
| +class RenderWidgetFeature;
|
|
|
| // BlimpContentsManager does the real work of creating BlimpContentsImpl, and
|
| // then passes the ownership to the caller. It also owns the observers to
|
| // monitor the life time of the contents it creates.
|
| class BlimpContentsManager {
|
| public:
|
| - BlimpContentsManager();
|
| + BlimpContentsManager(bool use_internal_display,
|
| + RenderWidgetFeature* render_widget_feature);
|
| ~BlimpContentsManager();
|
|
|
| std::unique_ptr<BlimpContentsImpl> CreateBlimpContents();
|
| @@ -40,6 +43,12 @@ class BlimpContentsManager {
|
| // lifetime of the observers.
|
| std::map<int, std::unique_ptr<BlimpContentsDeletionObserver>> observer_map_;
|
|
|
| + // Compositor dependencies shared across all BlimpContents.
|
| + CompositorDepsProvider compositor_deps_provider_;
|
| +
|
| + // The network bridge for a BlimpContents to the WebContents on the engine.
|
| + RenderWidgetFeature* render_widget_feature_;
|
| +
|
| base::WeakPtrFactory<BlimpContentsManager> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlimpContentsManager);
|
|
|