| Index: ui/events/android/events_jni_registrar.cc
|
| diff --git a/ui/android/ui_android_jni_registrar.cc b/ui/events/android/events_jni_registrar.cc
|
| similarity index 50%
|
| copy from ui/android/ui_android_jni_registrar.cc
|
| copy to ui/events/android/events_jni_registrar.cc
|
| index 9ed2d93e02345cbe98379525288d2d2a6d52435f..635a4ab5b9fbc0a3e4ec6437ee33d071b001b447 100644
|
| --- a/ui/android/ui_android_jni_registrar.cc
|
| +++ b/ui/events/android/events_jni_registrar.cc
|
| @@ -1,25 +1,26 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 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.
|
|
|
| -#include "ui/android/ui_android_jni_registrar.h"
|
| +#include "ui/events/android/events_jni_registrar.h"
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_registrar.h"
|
| -#include "ui/android/resources/resource_manager_impl.h"
|
| -#include "ui/android/view_android.h"
|
| -#include "ui/android/window_android.h"
|
| +#include "ui/events/android/motion_event_android.h"
|
|
|
| namespace ui {
|
| +namespace events {
|
| +namespace android {
|
|
|
| static base::android::RegistrationMethod kAndroidRegisteredMethods[] = {
|
| - {"ResourceManager", ui::ResourceManagerImpl::RegisterResourceManager},
|
| - {"WindowAndroid", WindowAndroid::RegisterWindowAndroid},
|
| + {"MotionEventAndroid", ui::MotionEventAndroid::RegisterMotionEventAndroid},
|
| };
|
|
|
| -bool RegisterUIAndroidJni(JNIEnv* env) {
|
| +bool RegisterJni(JNIEnv* env) {
|
| return RegisterNativeMethods(env, kAndroidRegisteredMethods,
|
| arraysize(kAndroidRegisteredMethods));
|
| }
|
|
|
| +} // namespace android
|
| +} // namespace events
|
| } // namespace ui
|
|
|