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

Unified Diff: blimp/client/app/android/blimp_jni_registrar.cc

Issue 1696563002: Blimp: add support for SSL connections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reland (safe_json issue fixed). Created 4 years, 10 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
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/app/blimp_client_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/client/app/android/blimp_jni_registrar.cc
diff --git a/blimp/client/app/android/blimp_jni_registrar.cc b/blimp/client/app/android/blimp_jni_registrar.cc
index 0ad0bcb7624f879ca448326cc2509a6e9a2f940d..2f6ad4d0a283164f20ab11059b00f0472c062e53 100644
--- a/blimp/client/app/android/blimp_jni_registrar.cc
+++ b/blimp/client/app/android/blimp_jni_registrar.cc
@@ -10,6 +10,7 @@
#include "blimp/client/app/android/blimp_view.h"
#include "blimp/client/app/android/tab_control_feature_android.h"
#include "blimp/client/app/android/toolbar.h"
+#include "components/safe_json/android/component_jni_registrar.h"
namespace blimp {
namespace client {
@@ -20,6 +21,7 @@ base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
{"Toolbar", Toolbar::RegisterJni},
{"BlimpView", BlimpView::RegisterJni},
{"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni},
+ {"SafeJson", safe_json::android::RegisterSafeJsonJni},
{"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni},
};
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/app/blimp_client_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698