| 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/browser/android/android_browser_process.h" | 10 #include "content/browser/android/android_browser_process.h" | 
| 11 #include "content/browser/android/command_line.h" | 11 #include "content/browser/android/command_line.h" | 
|  | 12 #include "content/browser/android/content_view_client.h" | 
| 12 #include "content/browser/android/device_info.h" | 13 #include "content/browser/android/device_info.h" | 
| 13 #include "content/browser/android/download_controller.h" | 14 #include "content/browser/android/download_controller.h" | 
| 14 #include "content/browser/android/jni_helper.h" | 15 #include "content/browser/android/jni_helper.h" | 
| 15 #include "content/browser/android/trace_event_binding.h" | 16 #include "content/browser/android/trace_event_binding.h" | 
|  | 17 #include "content/public/browser/content_view.h" | 
| 16 | 18 | 
| 17 namespace content { | 19 namespace content { | 
| 18 namespace android { | 20 namespace android { | 
| 19 | 21 | 
| 20 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 22 base::android::RegistrationMethod kContentRegisteredMethods[] = { | 
| 21   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 23   { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, | 
| 22   { "CommandLine", RegisterCommandLine }, | 24   { "CommandLine", RegisterCommandLine }, | 
|  | 25   { "ContentView", RegisterContentView }, | 
|  | 26   { "ContentViewClient", RegisterContentViewClient }, | 
| 23   { "ContentMain", content::RegisterContentMain }, | 27   { "ContentMain", content::RegisterContentMain }, | 
| 24   { "DeviceInfo", RegisterDeviceInfo }, | 28   { "DeviceInfo", RegisterDeviceInfo }, | 
| 25   { "DownloadController", DownloadController::RegisterDownloadController }, | 29   { "DownloadController", DownloadController::RegisterDownloadController }, | 
| 26   { "JniHelper", RegisterJniHelper }, | 30   { "JniHelper", RegisterJniHelper }, | 
| 27   { "TraceEvent", RegisterTraceEvent }, | 31   { "TraceEvent", RegisterTraceEvent }, | 
| 28 }; | 32 }; | 
| 29 | 33 | 
| 30 bool RegisterJni(JNIEnv* env) { | 34 bool RegisterJni(JNIEnv* env) { | 
| 31   return RegisterNativeMethods(env, kContentRegisteredMethods, | 35   return RegisterNativeMethods(env, kContentRegisteredMethods, | 
| 32                                arraysize(kContentRegisteredMethods)); | 36                                arraysize(kContentRegisteredMethods)); | 
| 33 } | 37 } | 
| 34 | 38 | 
| 35 }  // namespace android | 39 }  // namespace android | 
| 36 }  // namespace content | 40 }  // namespace content | 
| OLD | NEW | 
|---|