| Index: blimp/client/core/context/android/blimp_client_context_impl_android.h
|
| diff --git a/blimp/client/core/context/android/blimp_client_context_impl_android.h b/blimp/client/core/context/android/blimp_client_context_impl_android.h
|
| index 6153f2f43727bcf3722f7411a1d949121c3b80eb..a9f03e6bd0e18d6ecc853d751b1a163bc910d9f0 100644
|
| --- a/blimp/client/core/context/android/blimp_client_context_impl_android.h
|
| +++ b/blimp/client/core/context/android/blimp_client_context_impl_android.h
|
| @@ -31,7 +31,7 @@ class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
|
| scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> file_thread_task_runner,
|
| std::unique_ptr<CompositorDependencies> compositor_dependencies,
|
| - PrefService* local_state);
|
| + std::unique_ptr<Settings> settings);
|
| ~BlimpClientContextImplAndroid() override;
|
|
|
| base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
|
| @@ -55,6 +55,11 @@ class BlimpClientContextImplAndroid : public BlimpClientContextImpl {
|
| const base::android::JavaRef<jobject>& jobj,
|
| const base::android::JavaRef<jobject>& blimp_settings);
|
|
|
| + // Returns the Settings java object.
|
| + base::android::ScopedJavaLocalRef<jobject> GetSettings(
|
| + JNIEnv* env,
|
| + const base::android::JavaRef<jobject>& jobj);
|
| +
|
| protected:
|
| // BlimpClientContextImpl implementation.
|
| GURL GetAssignerURL() override;
|
|
|