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

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

Issue 2362693003: Add framework for sending feedback for Blimp. (Closed)
Patch Set: Rebased for good measure Created 4 years, 3 months 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/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
diff --git a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
index 7dea8667ee09a991874d05117fdb5690eee5c9e1..852866db6430f02ca8da690d14d081b47c2415c1 100644
--- a/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
+++ b/blimp/client/core/android/java/src/org/chromium/blimp/core/BlimpClientContextImpl.java
@@ -9,6 +9,7 @@ import android.preference.PreferenceFragment;
import org.chromium.base.CommandLine;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
+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.PreferencesUtil;
@@ -17,6 +18,9 @@ import org.chromium.blimp_public.BlimpClientContextDelegate;
import org.chromium.blimp_public.contents.BlimpContents;
import org.chromium.ui.base.WindowAndroid;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* BlimpClientContextImpl is a Java wrapper to allow communicating with the native
* BlimpClientContextImpl object.
@@ -91,6 +95,13 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen
nativeConnectFromJava(mNativeBlimpClientContextImplAndroid);
}
+ @Override
+ public Map<String, String> getFeedbackMap() {
+ if (mNativeBlimpClientContextImplAndroid == 0 || !isBlimpEnabled()) return new HashMap<>();
+
+ return nativeCreateBlimpFeedbackDataJava(mNativeBlimpClientContextImplAndroid).asMap();
+ }
+
@CalledByNative
private void clearNativePtr() {
mNativeBlimpClientContextImplAndroid = 0;
@@ -110,6 +121,9 @@ public class BlimpClientContextImpl implements BlimpClientContext, BlimpPreferen
private native BlimpContents nativeCreateBlimpContentsJava(
long nativeBlimpClientContextImplAndroid, long windowAndroidPtr);
+ private native BlimpFeedbackData nativeCreateBlimpFeedbackDataJava(
+ long nativeBlimpClientContextImplAndroid);
+
private native void nativeConnectFromJava(long nativeBlimpClientContextImplAndroid);
private native void nativeInitSettingsPage(
long nativeBlimpClientContextImplAndroid, AboutBlimpPreferences preferences);

Powered by Google App Engine
This is Rietveld 408576698