| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/app/android/content_jni_registrar.h" | 5 #include "content/app/android/content_jni_registrar.h" | 
| 6 | 6 | 
| 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 "content/app/android/content_main.h" | 9 #include "content/app/android/content_main.h" | 
| 10 #include "content/app/android/sandboxed_process_service.h" | 10 #include "content/app/android/sandboxed_process_service.h" | 
| 11 #include "content/browser/android/android_browser_process.h" | 11 #include "content/browser/android/android_browser_process.h" | 
| 12 #include "content/browser/android/content_view_client.h" | 12 #include "content/browser/android/content_view_client.h" | 
| 13 #include "content/browser/android/content_view_impl.h" | 13 #include "content/browser/android/content_view_impl.h" | 
| 14 #include "content/browser/android/device_info.h" | 14 #include "content/browser/android/device_info.h" | 
| 15 #include "content/browser/android/download_controller.h" | 15 #include "content/browser/android/download_controller.h" | 
| 16 #include "content/browser/android/sandboxed_process_launcher.h" | 16 #include "content/browser/android/sandboxed_process_launcher.h" | 
|  | 17 #include "content/browser/android/touch_point.h" | 
| 17 #include "content/common/android/command_line.h" | 18 #include "content/common/android/command_line.h" | 
| 18 #include "content/common/android/surface_callback.h" | 19 #include "content/common/android/surface_callback.h" | 
| 19 #include "content/common/android/trace_event_binding.h" | 20 #include "content/common/android/trace_event_binding.h" | 
| 20 | 21 | 
| 21 namespace content { | 22 namespace content { | 
| 22 namespace android { | 23 namespace android { | 
| 23 | 24 | 
| 24 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 25 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 
| 25   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 26   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 
| 26   { "CommandLine", RegisterCommandLine }, | 27   { "CommandLine", RegisterCommandLine }, | 
| 27   { "ContentView", RegisterContentView }, | 28   { "ContentView", RegisterContentView }, | 
| 28   { "ContentViewClient", RegisterContentViewClient }, | 29   { "ContentViewClient", RegisterContentViewClient }, | 
| 29   { "ContentMain", content::RegisterContentMain }, | 30   { "ContentMain", content::RegisterContentMain }, | 
| 30   { "DeviceInfo", RegisterDeviceInfo }, | 31   { "DeviceInfo", RegisterDeviceInfo }, | 
| 31   { "DownloadController", DownloadController::RegisterDownloadController }, | 32   { "DownloadController", DownloadController::RegisterDownloadController }, | 
| 32   { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 33   { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, | 
| 33   { "SandboxedProcessService", content::RegisterSandboxedProcessService }, | 34   { "SandboxedProcessService", content::RegisterSandboxedProcessService }, | 
| 34   { "SurfaceCallback", content::RegisterSurfaceCallback }, | 35   { "SurfaceCallback", content::RegisterSurfaceCallback }, | 
|  | 36   { "TouchPoint", content::RegisterTouchPoint }, | 
| 35   { "TraceEvent", RegisterTraceEvent }, | 37   { "TraceEvent", RegisterTraceEvent }, | 
| 36 }; | 38 }; | 
| 37 | 39 | 
| 38 bool RegisterJni(JNIEnv* env) { | 40 bool RegisterJni(JNIEnv* env) { | 
| 39   return RegisterNativeMethods(env, kContentRegisteredMethods, | 41   return RegisterNativeMethods(env, kContentRegisteredMethods, | 
| 40                                arraysize(kContentRegisteredMethods)); | 42                                arraysize(kContentRegisteredMethods)); | 
| 41 } | 43 } | 
| 42 | 44 | 
| 43 }  // namespace android | 45 }  // namespace android | 
| 44 }  // namespace content | 46 }  // namespace content | 
| OLD | NEW | 
|---|