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

Side by Side 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, 9 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 unified diff | Download patch
« no previous file with comments | « blimp/client/DEPS ('k') | blimp/client/app/blimp_client_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "blimp/client/app/android/blimp_jni_registrar.h" 5 #include "blimp/client/app/android/blimp_jni_registrar.h"
6 6
7 #include "base/android/jni_registrar.h" 7 #include "base/android/jni_registrar.h"
8 #include "blimp/client/app/android/blimp_client_session_android.h" 8 #include "blimp/client/app/android/blimp_client_session_android.h"
9 #include "blimp/client/app/android/blimp_library_loader.h" 9 #include "blimp/client/app/android/blimp_library_loader.h"
10 #include "blimp/client/app/android/blimp_view.h" 10 #include "blimp/client/app/android/blimp_view.h"
11 #include "blimp/client/app/android/tab_control_feature_android.h" 11 #include "blimp/client/app/android/tab_control_feature_android.h"
12 #include "blimp/client/app/android/toolbar.h" 12 #include "blimp/client/app/android/toolbar.h"
13 #include "components/safe_json/android/component_jni_registrar.h"
13 14
14 namespace blimp { 15 namespace blimp {
15 namespace client { 16 namespace client {
16 namespace { 17 namespace {
17 18
18 base::android::RegistrationMethod kBlimpRegistrationMethods[] = { 19 base::android::RegistrationMethod kBlimpRegistrationMethods[] = {
19 {"BlimpLibraryLoader", RegisterBlimpLibraryLoaderJni}, 20 {"BlimpLibraryLoader", RegisterBlimpLibraryLoaderJni},
20 {"Toolbar", Toolbar::RegisterJni}, 21 {"Toolbar", Toolbar::RegisterJni},
21 {"BlimpView", BlimpView::RegisterJni}, 22 {"BlimpView", BlimpView::RegisterJni},
22 {"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni}, 23 {"BlimpClientSessionAndroid", BlimpClientSessionAndroid::RegisterJni},
24 {"SafeJson", safe_json::android::RegisterSafeJsonJni},
23 {"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni}, 25 {"TabControlFeatureAndroid", TabControlFeatureAndroid::RegisterJni},
24 }; 26 };
25 27
26 } // namespace 28 } // namespace
27 29
28 bool RegisterBlimpJni(JNIEnv* env) { 30 bool RegisterBlimpJni(JNIEnv* env) {
29 return base::android::RegisterNativeMethods( 31 return base::android::RegisterNativeMethods(
30 env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods)); 32 env, kBlimpRegistrationMethods, arraysize(kBlimpRegistrationMethods));
31 } 33 }
32 34
33 } // namespace client 35 } // namespace client
34 } // namespace blimp 36 } // namespace blimp
OLDNEW
« 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