Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(637)

Unified Diff: blimp/client/core/context/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java

Issue 2463423002: Add Settings[, Oberser] java code and JNI bridge. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698