| Index: blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| diff --git a/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java b/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| index 557d606e09529e20c5bb2fa383698bf875329ffe..79998bee439f8455d0b3861615e0577034cdd8c7 100644
|
| --- a/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| +++ b/blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
|
| @@ -13,6 +13,7 @@ import org.chromium.blimp.core.common.PreferencesUtil;
|
| import org.chromium.blimp.core.feedback.BlimpFeedbackData;
|
| import org.chromium.blimp.core.settings.AboutBlimpPreferences;
|
| import org.chromium.blimp.core.settings.BlimpPreferencesDelegate;
|
| +import org.chromium.blimp.core.settings.Settings;
|
| import org.chromium.blimp_public.BlimpClientContext;
|
| import org.chromium.blimp_public.BlimpClientContextDelegate;
|
| import org.chromium.blimp_public.contents.BlimpContents;
|
| @@ -61,6 +62,14 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen
|
| mNativeBlimpClientContextImplAndroid = nativeBlimpClientContextImplAndroid;
|
| }
|
|
|
| + /**
|
| + * Get Settings java object, whose lifetime is the same as BlimpClientContextImpl's.
|
| + */
|
| + public Settings getSettings() {
|
| + assert mNativeBlimpClientContextImplAndroid != 0;
|
| + return nativeGetSettings(mNativeBlimpClientContextImplAndroid);
|
| + }
|
| +
|
| @Override
|
| public BlimpContents createBlimpContents(WindowAndroid windowAndroid) {
|
| assert mNativeBlimpClientContextImplAndroid != 0;
|
| @@ -127,4 +136,5 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen
|
| private native void nativeConnectFromJava(long nativeBlimpClientContextImplAndroid);
|
| private native void nativeInitSettingsPage(
|
| long nativeBlimpClientContextImplAndroid, AboutBlimpPreferences preferences);
|
| + private native Settings nativeGetSettings(long nativeBlimpClientContextImplAndroid);
|
| }
|
|
|