| Index: blimp/client/public/blimp_client_context.h
|
| diff --git a/blimp/client/public/blimp_client_context.h b/blimp/client/public/blimp_client_context.h
|
| index bfcc3f96824700babdabbba3d359a39c20751444..62b22d0b01bec23d9d19b4bc9b7b96ee7359b1e9 100644
|
| --- a/blimp/client/public/blimp_client_context.h
|
| +++ b/blimp/client/public/blimp_client_context.h
|
| @@ -13,6 +13,8 @@
|
| #include "blimp/client/public/blimp_client_context_delegate.h"
|
| #include "blimp/client/public/contents/blimp_contents.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| +#include "components/prefs/pref_registry_simple.h"
|
| +#include "components/prefs/pref_service.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -51,7 +53,12 @@ class BlimpClientContext : public KeyedService {
|
| static BlimpClientContext* Create(
|
| 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);
|
| +
|
| + // Register Blimp prefs. The implementation of this function depends on
|
| + // whether the core or dummy implementation of Blimp has been linked in.
|
| + static void RegisterPrefs(PrefRegistrySimple* registry);
|
|
|
| // The delegate provides all the required functionality from the embedder.
|
| virtual void SetDelegate(BlimpClientContextDelegate* delegate) = 0;
|
|
|