Chromium Code Reviews| 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..c3a16839887411720b57276d20e1d04edbe02d31 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,10 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen |
| mNativeBlimpClientContextImplAndroid = nativeBlimpClientContextImplAndroid; |
| } |
| + public Settings getSettings() { |
|
David Trainor- moved to gerrit
2016/11/03 03:05:10
Add javadoc
Menglin
2016/11/03 23:17:01
Done.
|
| + return nativeGetSettings(mNativeBlimpClientContextImplAndroid); |
|
David Trainor- moved to gerrit
2016/11/03 03:05:10
Assert that mNativeBlimpCLientContextImplAndroid !
Menglin
2016/11/03 23:17:01
Done.
|
| + } |
| + |
| @Override |
| public BlimpContents createBlimpContents(WindowAndroid windowAndroid) { |
| assert mNativeBlimpClientContextImplAndroid != 0; |
| @@ -127,4 +132,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); |
| } |