| Index: remoting/host/android/remoting_host_jni_onload.cc
|
| diff --git a/remoting/client/jni/remoting_jni_onload.cc b/remoting/host/android/remoting_host_jni_onload.cc
|
| similarity index 62%
|
| copy from remoting/client/jni/remoting_jni_onload.cc
|
| copy to remoting/host/android/remoting_host_jni_onload.cc
|
| index 2140e4a186da5bf012445f478349526612fef205..75e5b256c5fb0cab27f275e195fe26f9fbdd83c5 100644
|
| --- a/remoting/client/jni/remoting_jni_onload.cc
|
| +++ b/remoting/host/android/remoting_host_jni_onload.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -6,25 +6,20 @@
|
| #include "base/android/base_jni_registrar.h"
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| -#include "base/android/jni_utils.h"
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| -#include "net/android/net_jni_registrar.h"
|
| -#include "remoting/client/jni/remoting_jni_registrar.h"
|
| -#include "ui/gfx/android/gfx_jni_registrar.h"
|
| +#include "remoting/host/android/remoting_host_jni_registrar.h"
|
|
|
| namespace {
|
|
|
| base::android::RegistrationMethod kRemotingRegisteredMethods[] = {
|
| - {"base", base::android::RegisterJni},
|
| - {"gfx", gfx::android::RegisterJni},
|
| - {"net", net::android::RegisterJni},
|
| - {"remoting", remoting::RegisterJni},
|
| + {"base", base::android::RegisterJni},
|
| + {"remoting_host", remoting::RegisterJni},
|
| };
|
|
|
| bool RegisterJNI(JNIEnv* env) {
|
| - return base::android::RegisterNativeMethods(env,
|
| - kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods));
|
| + return base::android::RegisterNativeMethods(
|
| + env, kRemotingRegisteredMethods, arraysize(kRemotingRegisteredMethods));
|
| }
|
|
|
| } // namespace
|
|
|