diff options
Diffstat (limited to 'content')
24 files changed, 51 insertions, 76 deletions
diff --git a/content/app/android/content_main.cc b/content/app/android/content_main.cc index bd509ca..f373186 100644 --- a/content/app/android/content_main.cc +++ b/content/app/android/content_main.cc @@ -12,7 +12,7 @@ #include "content/public/app/content_main_delegate.h" #include "content/public/app/content_main_runner.h" #include "content/public/common/content_switches.h" -#include "jni/content_main_jni.h" +#include "jni/ContentMain_jni.h" #include "webkit/glue/user_agent.h" using base::LazyInstance; diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc index 0661fe1..e534a0ba 100644 --- a/content/app/android/library_loader_hooks.cc +++ b/content/app/android/library_loader_hooks.cc @@ -24,7 +24,7 @@ #include "content/public/common/content_switches.h" #include "media/base/android/media_jni_registrar.h" #include "net/android/net_jni_registrar.h" -#include "jni/library_loader_jni.h" +#include "jni/LibraryLoader_jni.h" namespace { base::AtExitManager* g_at_exit_manager = NULL; diff --git a/content/app/android/sandboxed_process_service.cc b/content/app/android/sandboxed_process_service.cc index 58a2687..291748f 100644 --- a/content/app/android/sandboxed_process_service.cc +++ b/content/app/android/sandboxed_process_service.cc @@ -11,7 +11,7 @@ #include "content/public/app/android_library_loader_hooks.h" #include "content/public/common/content_descriptors.h" #include "ipc/ipc_descriptors.h" -#include "jni/sandboxed_process_service_jni.h" +#include "jni/SandboxedProcessService_jni.h" using base::android::AttachCurrentThread; using base::android::CheckException; diff --git a/content/app/android/user_agent.cc b/content/app/android/user_agent.cc index aa284e5..7a1c49b 100644 --- a/content/app/android/user_agent.cc +++ b/content/app/android/user_agent.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "jni/user_agent_jni.h" +#include "jni/UserAgent_jni.h" using base::android::AttachCurrentThread; using base::android::ScopedJavaLocalRef; diff --git a/content/browser/android/android_browser_process.cc b/content/browser/android/android_browser_process.cc index 6b1ec64..6d887cb 100644 --- a/content/browser/android/android_browser_process.cc +++ b/content/browser/android/android_browser_process.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "content/browser/android/content_startup_flags.h" #include "content/public/common/content_constants.h" -#include "jni/android_browser_process_jni.h" +#include "jni/AndroidBrowserProcess_jni.h" using base::android::ConvertJavaStringToUTF8; diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc index 284c1fe..4511c37 100644 --- a/content/browser/android/content_settings.cc +++ b/content/browser/android/content_settings.cc @@ -10,7 +10,7 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/public/browser/web_contents.h" -#include "jni/content_settings_jni.h" +#include "jni/ContentSettings_jni.h" #include "webkit/glue/user_agent.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webpreferences.h" diff --git a/content/browser/android/content_view_client.cc b/content/browser/android/content_view_client.cc index 908ce5c..652796c 100644 --- a/content/browser/android/content_view_client.cc +++ b/content/browser/android/content_view_client.cc @@ -23,7 +23,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/referrer.h" -#include "jni/content_view_client_jni.h" +#include "jni/ContentViewClient_jni.h" #include "net/http/http_request_headers.h" #include "ui/gfx/rect.h" #include "webkit/glue/window_open_disposition.h" diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 5849427..a867ae5 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -13,7 +13,7 @@ #include "content/browser/web_contents/navigation_controller_impl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/web_contents.h" -#include "jni/content_view_core_jni.h" +#include "jni/ContentViewCore_jni.h" #include "webkit/glue/webmenuitem.h" using base::android::AttachCurrentThread; diff --git a/content/browser/android/content_view_statics.cc b/content/browser/android/content_view_statics.cc index bac7b18..b3537ef9 100644 --- a/content/browser/android/content_view_statics.cc +++ b/content/browser/android/content_view_statics.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "content/browser/android/content_view_statics.h" #include "content/common/android/address_parser.h" -#include "jni/content_view_statics_jni.h" +#include "jni/ContentViewStatics_jni.h" using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF16ToJavaString; diff --git a/content/browser/android/download_controller.cc b/content/browser/android/download_controller.cc index 16e370a..13b75c7 100644 --- a/content/browser/android/download_controller.cc +++ b/content/browser/android/download_controller.cc @@ -18,7 +18,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/global_request_id.h" -#include "jni/download_controller_jni.h" +#include "jni/DownloadController_jni.h" #include "net/cookies/cookie_options.h" #include "net/cookies/cookie_store.h" #include "net/http/http_request_headers.h" diff --git a/content/browser/android/remote_debugging_controller.cc b/content/browser/android/remote_debugging_controller.cc index 763cd16..67f1bd6 100644 --- a/content/browser/android/remote_debugging_controller.cc +++ b/content/browser/android/remote_debugging_controller.cc @@ -7,7 +7,7 @@ #include <jni.h> #include "content/public/browser/android/devtools_server.h" -#include "jni/remote_debugging_controller_jni.h" +#include "jni/RemoteDebuggingController_jni.h" namespace content { diff --git a/content/browser/android/sandboxed_process_launcher.cc b/content/browser/android/sandboxed_process_launcher.cc index 9ab99a4..f46f2bb 100644 --- a/content/browser/android/sandboxed_process_launcher.cc +++ b/content/browser/android/sandboxed_process_launcher.cc @@ -8,7 +8,7 @@ #include "base/android/jni_array.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "jni/sandboxed_process_launcher_jni.h" +#include "jni/SandboxedProcessLauncher_jni.h" using base::android::AttachCurrentThread; using base::android::ToJavaArrayOfStrings; diff --git a/content/browser/android/touch_point.cc b/content/browser/android/touch_point.cc index 17d888d..70ed9db 100644 --- a/content/browser/android/touch_point.cc +++ b/content/browser/android/touch_point.cc @@ -8,7 +8,7 @@ #include "base/time.h" #include "base/logging.h" -#include "jni/touch_point_jni.h" +#include "jni/TouchPoint_jni.h" using WebKit::WebTouchEvent; using WebKit::WebTouchPoint; diff --git a/content/browser/device_orientation/data_fetcher_impl_android.cc b/content/browser/device_orientation/data_fetcher_impl_android.cc index 0354635..e51af51 100644 --- a/content/browser/device_orientation/data_fetcher_impl_android.cc +++ b/content/browser/device_orientation/data_fetcher_impl_android.cc @@ -9,7 +9,7 @@ #include "base/lazy_instance.h" #include "base/logging.h" #include "content/browser/device_orientation/orientation.h" -#include "jni/device_orientation_jni.h" +#include "jni/DeviceOrientation_jni.h" using base::android::AttachCurrentThread; using base::android::CheckException; diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/content/browser/geolocation/location_api_adapter_android.cc index 9c2356c..6028a43 100644 --- a/content/browser/geolocation/location_api_adapter_android.cc +++ b/content/browser/geolocation/location_api_adapter_android.cc @@ -9,7 +9,7 @@ #include "base/bind.h" #include "base/location.h" #include "content/browser/geolocation/location_provider_android.h" -#include "jni/location_provider_jni.h" +#include "jni/LocationProvider_jni.h" using base::android::AttachCurrentThread; using base::android::CheckException; diff --git a/content/common/android/command_line.cc b/content/common/android/command_line.cc index 5b95174..8ac58c2 100644 --- a/content/common/android/command_line.cc +++ b/content/common/android/command_line.cc @@ -8,7 +8,7 @@ #include "base/android/jni_string.h" #include "base/command_line.h" #include "base/logging.h" -#include "jni/command_line_jni.h" +#include "jni/CommandLine_jni.h" using base::android::AppendJavaStringArrayToStringVector; using base::android::ConvertJavaStringToUTF8; diff --git a/content/common/android/device_info.cc b/content/common/android/device_info.cc index 57211bb..2522cae 100644 --- a/content/common/android/device_info.cc +++ b/content/common/android/device_info.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/logging.h" -#include "jni/device_info_jni.h" +#include "jni/DeviceInfo_jni.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF8; diff --git a/content/common/android/surface_callback.cc b/content/common/android/surface_callback.cc index 069c49b..77757e9 100644 --- a/content/common/android/surface_callback.cc +++ b/content/common/android/surface_callback.cc @@ -15,7 +15,7 @@ #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "ui/gl/android_native_window.h" -#include "jni/surface_callback_jni.h" +#include "jni/SurfaceCallback_jni.h" using base::android::AttachCurrentThread; using base::android::CheckException; diff --git a/content/common/android/surface_texture_listener.cc b/content/common/android/surface_texture_listener.cc index 1d50a14..6ff63b4 100644 --- a/content/common/android/surface_texture_listener.cc +++ b/content/common/android/surface_texture_listener.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "content/common/android/surface_texture_bridge.h" -#include "jni/surface_texture_listener_jni.h" +#include "jni/SurfaceTextureListener_jni.h" namespace content { diff --git a/content/common/android/trace_event_binding.cc b/content/common/android/trace_event_binding.cc index a39330b..3b14de0 100644 --- a/content/common/android/trace_event_binding.cc +++ b/content/common/android/trace_event_binding.cc @@ -10,7 +10,7 @@ #include "base/debug/trace_event.h" #include "base/lazy_instance.h" -#include "jni/trace_event_jni.h" +#include "jni/TraceEvent_jni.h" namespace { diff --git a/content/content_jni.gypi b/content/content_jni.gypi index ba35902..60c8c3a 100644 --- a/content/content_jni.gypi +++ b/content/content_jni.gypi @@ -7,53 +7,31 @@ # require specifying the java directory and generate the rest. # TODO(jrg): when doing the above, make sure we support multiple # output directories (e.g. browser/jni and common/jni if needed). + 'sources': [ + 'public/android/java/src/org/chromium/content/app/ContentMain.java', + 'public/android/java/src/org/chromium/content/app/LibraryLoader.java', + 'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java', + 'public/android/java/src/org/chromium/content/app/UserAgent.java', + 'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java', + 'public/android/java/src/org/chromium/content/browser/ContentSettings.java', + 'public/android/java/src/org/chromium/content/browser/ContentVideoView.java', + 'public/android/java/src/org/chromium/content/browser/ContentViewClient.java', + 'public/android/java/src/org/chromium/content/browser/ContentViewCore.java', + 'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java', + 'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java', + 'public/android/java/src/org/chromium/content/browser/DownloadController.java', + 'public/android/java/src/org/chromium/content/browser/LocationProvider.java', + 'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java', + 'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java', + 'public/android/java/src/org/chromium/content/browser/TouchPoint.java', + 'public/android/java/src/org/chromium/content/common/CommandLine.java', + 'public/android/java/src/org/chromium/content/common/DeviceInfo.java', + 'public/android/java/src/org/chromium/content/common/SurfaceCallback.java', + 'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java', + 'public/android/java/src/org/chromium/content/common/TraceEvent.java', + ], 'variables': { - 'java_sources': [ - 'public/android/java/src/org/chromium/content/app/ContentMain.java', - 'public/android/java/src/org/chromium/content/app/LibraryLoader.java', - 'public/android/java/src/org/chromium/content/app/SandboxedProcessService.java', - 'public/android/java/src/org/chromium/content/app/UserAgent.java', - 'public/android/java/src/org/chromium/content/browser/AndroidBrowserProcess.java', - 'public/android/java/src/org/chromium/content/browser/ContentSettings.java', - 'public/android/java/src/org/chromium/content/browser/ContentVideoView.java', - 'public/android/java/src/org/chromium/content/browser/ContentViewClient.java', - 'public/android/java/src/org/chromium/content/browser/ContentViewCore.java', - 'public/android/java/src/org/chromium/content/browser/ContentViewStatics.java', - 'public/android/java/src/org/chromium/content/browser/DeviceOrientation.java', - 'public/android/java/src/org/chromium/content/browser/DownloadController.java', - 'public/android/java/src/org/chromium/content/browser/LocationProvider.java', - 'public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java', - 'public/android/java/src/org/chromium/content/browser/SandboxedProcessLauncher.java', - 'public/android/java/src/org/chromium/content/browser/TouchPoint.java', - 'public/android/java/src/org/chromium/content/common/CommandLine.java', - 'public/android/java/src/org/chromium/content/common/DeviceInfo.java', - 'public/android/java/src/org/chromium/content/common/SurfaceCallback.java', - 'public/android/java/src/org/chromium/content/common/SurfaceTextureListener.java', - 'public/android/java/src/org/chromium/content/common/TraceEvent.java', - ], - 'jni_headers': [ - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_settings_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_video_view_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_core_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_statics_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_orientation_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/download_controller_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/remote_debugging_controller_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/touch_point_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/device_info_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_texture_listener_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h', - ], + 'jni_gen_dir': 'content' }, 'includes': [ '../build/jni_generator.gypi' ], } diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 7fd1c2f..213b32e 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -503,15 +503,12 @@ # require specifying the java directory and generate the rest. 'target_name': 'content_shell_jni_headers', 'type': 'none', + 'sources': [ + 'shell/android/java/src/org/chromium/content_shell/ShellManager.java', + 'shell/android/java/src/org/chromium/content_shell/Shell.java', + ], 'variables': { - 'java_sources': [ - 'shell/android/java/src/org/chromium/content_shell/ShellManager.java', - 'shell/android/java/src/org/chromium/content_shell/Shell.java', - ], - 'jni_headers': [ - '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h', - '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_jni.h', - ], + 'jni_gen_dir': 'content/shell', }, 'includes': [ '../build/jni_generator.gypi' ], }, diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index 18c1223..127e25a 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" #include "base/lazy_instance.h" -#include "jni/shell_manager_jni.h" +#include "jni/ShellManager_jni.h" using base::android::ScopedJavaLocalRef; diff --git a/content/shell/shell_android.cc b/content/shell/shell_android.cc index a8fea37..242651c 100644 --- a/content/shell/shell_android.cc +++ b/content/shell/shell_android.cc @@ -11,7 +11,7 @@ #include "base/logging.h" #include "base/string_piece.h" #include "content/shell/android/shell_manager.h" -#include "jni/shell_jni.h" +#include "jni/Shell_jni.h" using base::android::AttachCurrentThread; using base::android::ConvertUTF8ToJavaString; |