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

Side by Side Diff: remoting/client/jni/remoting_jni_onload.cc

Issue 1542203002: Switch to standard integer types in remoting/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@int-remoting-host
Patch Set: Created 4 years, 12 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 | « remoting/client/jni/jni_frame_consumer.cc ('k') | remoting/client/key_event_mapper.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/android/base_jni_onload.h" 5 #include "base/android/base_jni_onload.h"
6 #include "base/android/base_jni_registrar.h" 6 #include "base/android/base_jni_registrar.h"
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/android/jni_utils.h" 9 #include "base/android/jni_utils.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/macros.h"
11 #include "net/android/net_jni_registrar.h" 12 #include "net/android/net_jni_registrar.h"
12 #include "remoting/client/jni/remoting_jni_registrar.h" 13 #include "remoting/client/jni/remoting_jni_registrar.h"
13 #include "ui/gfx/android/gfx_jni_registrar.h" 14 #include "ui/gfx/android/gfx_jni_registrar.h"
14 15
15 namespace { 16 namespace {
16 17
17 base::android::RegistrationMethod kRemotingRegisteredMethods[] = { 18 base::android::RegistrationMethod kRemotingRegisteredMethods[] = {
18 {"base", base::android::RegisterJni}, 19 {"base", base::android::RegisterJni},
19 {"gfx", gfx::android::RegisterJni}, 20 {"gfx", gfx::android::RegisterJni},
20 {"net", net::android::RegisterJni}, 21 {"net", net::android::RegisterJni},
(...skipping 10 matching lines...) Expand all
31 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 32 JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
32 std::vector<base::android::RegisterCallback> register_callbacks; 33 std::vector<base::android::RegisterCallback> register_callbacks;
33 register_callbacks.push_back(base::Bind(&RegisterJNI)); 34 register_callbacks.push_back(base::Bind(&RegisterJNI));
34 std::vector<base::android::InitCallback> init_callbacks; 35 std::vector<base::android::InitCallback> init_callbacks;
35 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 36 if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
36 !base::android::OnJNIOnLoadInit(init_callbacks)) { 37 !base::android::OnJNIOnLoadInit(init_callbacks)) {
37 return -1; 38 return -1;
38 } 39 }
39 return JNI_VERSION_1_4; 40 return JNI_VERSION_1_4;
40 } 41 }
OLDNEW
« no previous file with comments | « remoting/client/jni/jni_frame_consumer.cc ('k') | remoting/client/key_event_mapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698