Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(482)

Side by Side Diff: content/browser/android/browser_jni_registrar.cc

Issue 10969045: Revert 158067 - Remove native side of content_view_client (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/browser/android/browser_jni_registrar.h" 5 #include "content/browser/android/browser_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/browser/android/android_browser_process.h" 9 #include "content/browser/android/android_browser_process.h"
10 #include "content/browser/android/content_settings.h" 10 #include "content/browser/android/content_settings.h"
11 #include "content/browser/android/content_video_view.h" 11 #include "content/browser/android/content_video_view.h"
12 #include "content/browser/android/content_view_client.h"
12 #include "content/browser/android/content_view_core_impl.h" 13 #include "content/browser/android/content_view_core_impl.h"
13 #include "content/browser/android/content_view_statics.h" 14 #include "content/browser/android/content_view_statics.h"
14 #include "content/browser/android/download_controller.h" 15 #include "content/browser/android/download_controller.h"
15 #include "content/browser/android/load_url_params.h" 16 #include "content/browser/android/load_url_params.h"
16 #include "content/browser/android/sandboxed_process_launcher.h" 17 #include "content/browser/android/sandboxed_process_launcher.h"
17 #include "content/browser/android/surface_texture_peer_browser_impl.h" 18 #include "content/browser/android/surface_texture_peer_browser_impl.h"
18 #include "content/browser/android/touch_point.h" 19 #include "content/browser/android/touch_point.h"
19 #include "content/browser/android/web_contents_observer_android.h" 20 #include "content/browser/android/web_contents_observer_android.h"
20 #include "content/browser/geolocation/location_api_adapter_android.h" 21 #include "content/browser/geolocation/location_api_adapter_android.h"
21 #include "content/browser/renderer_host/ime_adapter_android.h" 22 #include "content/browser/renderer_host/ime_adapter_android.h"
22 #include "content/browser/renderer_host/java/java_bound_object.h" 23 #include "content/browser/renderer_host/java/java_bound_object.h"
23 24
24 using content::SurfaceTexturePeerBrowserImpl; 25 using content::SurfaceTexturePeerBrowserImpl;
25 26
26 namespace { 27 namespace {
27 base::android::RegistrationMethod kContentRegisteredMethods[] = { 28 base::android::RegistrationMethod kContentRegisteredMethods[] = {
28 { "AndroidLocationApiAdapter", 29 { "AndroidLocationApiAdapter",
29 AndroidLocationApiAdapter::RegisterGeolocationService }, 30 AndroidLocationApiAdapter::RegisterGeolocationService },
30 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, 31 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
31 { "BrowserProcessSurfaceTexture", 32 { "BrowserProcessSurfaceTexture",
32 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture }, 33 SurfaceTexturePeerBrowserImpl::RegisterBrowserProcessSurfaceTexture },
33 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, 34 { "ContentSettings", content::ContentSettings::RegisterContentSettings },
34 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 35 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
36 { "ContentViewClient", content::RegisterContentViewClient },
35 { "ContentViewCore", content::RegisterContentViewCore }, 37 { "ContentViewCore", content::RegisterContentViewCore },
36 { "DownloadController", 38 { "DownloadController",
37 content::DownloadController::RegisterDownloadController }, 39 content::DownloadController::RegisterDownloadController },
38 { "RegisterImeAdapter", content::RegisterImeAdapter }, 40 { "RegisterImeAdapter", content::RegisterImeAdapter },
39 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject }, 41 { "JavaBoundObject", JavaBoundObject::RegisterJavaBoundObject },
40 { "LoadUrlParams", content::RegisterLoadUrlParams }, 42 { "LoadUrlParams", content::RegisterLoadUrlParams },
41 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, 43 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
42 { "TouchPoint", content::RegisterTouchPoint }, 44 { "TouchPoint", content::RegisterTouchPoint },
43 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, 45 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
44 { "WebViewStatics", content::RegisterWebViewStatics }, 46 { "WebViewStatics", content::RegisterWebViewStatics },
45 }; 47 };
46 48
47 } // namespace 49 } // namespace
48 50
49 namespace content { 51 namespace content {
50 namespace android { 52 namespace android {
51 53
52 bool RegisterBrowserJni(JNIEnv* env) { 54 bool RegisterBrowserJni(JNIEnv* env) {
53 return RegisterNativeMethods(env, kContentRegisteredMethods, 55 return RegisterNativeMethods(env, kContentRegisteredMethods,
54 arraysize(kContentRegisteredMethods)); 56 arraysize(kContentRegisteredMethods));
55 } 57 }
56 58
57 } // namespace android 59 } // namespace android
58 } // namespace content 60 } // namespace content
OLDNEW
« no previous file with comments | « base/android/jni_generator/jni_generator.py ('k') | content/browser/android/content_view_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698