| Index: blimp/client/core/blimp_client_context_impl.h
|
| diff --git a/blimp/client/core/blimp_client_context_impl.h b/blimp/client/core/blimp_client_context_impl.h
|
| index d2053ece2a87afa2dc6c661c8a0fe9efda0d35a4..dff93a46ee4a2f17b339ebe2586cab5f6a896f82 100644
|
| --- a/blimp/client/core/blimp_client_context_impl.h
|
| +++ b/blimp/client/core/blimp_client_context_impl.h
|
| @@ -36,6 +36,7 @@ class ImeFeature;
|
| class NavigationFeature;
|
| class RenderWidgetFeature;
|
| class SettingsFeature;
|
| +class Settings;
|
| class TabControlFeature;
|
|
|
| // BlimpClientContextImpl is the implementation of the main context-class for
|
| @@ -52,7 +53,8 @@ class BlimpClientContextImpl
|
| BlimpClientContextImpl(
|
| scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
|
| - std::unique_ptr<CompositorDependencies> compositor_dependencies);
|
| + std::unique_ptr<CompositorDependencies> compositor_dependencies,
|
| + PrefService* local_state);
|
| ~BlimpClientContextImpl() override;
|
|
|
| // BlimpClientContext implementation.
|
| @@ -130,6 +132,9 @@ class BlimpClientContextImpl
|
| // Connection status to the engine.
|
| ConnectionStatus connection_status_;
|
|
|
| + // Through this settings are set and retrieved.
|
| + std::unique_ptr<Settings> settings_;
|
| +
|
| base::WeakPtrFactory<BlimpClientContextImpl> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BlimpClientContextImpl);
|
|
|