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

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

Issue 12321131: Renamed Sandboxed process to Child process (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebaesed and removed stub SandboxedProcessService Created 7 years, 9 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
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/child_process_launcher.h"
10 #include "content/browser/android/content_settings.h" 11 #include "content/browser/android/content_settings.h"
11 #include "content/browser/android/content_video_view.h" 12 #include "content/browser/android/content_video_view.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_render_view.h" 14 #include "content/browser/android/content_view_render_view.h"
14 #include "content/browser/android/content_view_statics.h" 15 #include "content/browser/android/content_view_statics.h"
15 #include "content/browser/android/date_time_chooser_android.h" 16 #include "content/browser/android/date_time_chooser_android.h"
16 #include "content/browser/android/download_controller_android_impl.h" 17 #include "content/browser/android/download_controller_android_impl.h"
17 #include "content/browser/android/interstitial_page_delegate_android.h" 18 #include "content/browser/android/interstitial_page_delegate_android.h"
18 #include "content/browser/android/load_url_params.h" 19 #include "content/browser/android/load_url_params.h"
19 #include "content/browser/android/sandboxed_process_launcher.h"
20 #include "content/browser/android/surface_texture_peer_browser_impl.h" 20 #include "content/browser/android/surface_texture_peer_browser_impl.h"
21 #include "content/browser/android/touch_point.h" 21 #include "content/browser/android/touch_point.h"
22 #include "content/browser/android/tracing_intent_handler.h" 22 #include "content/browser/android/tracing_intent_handler.h"
23 #include "content/browser/android/web_contents_observer_android.h" 23 #include "content/browser/android/web_contents_observer_android.h"
24 #include "content/browser/geolocation/location_api_adapter_android.h" 24 #include "content/browser/geolocation/location_api_adapter_android.h"
25 #include "content/browser/renderer_host/ime_adapter_android.h" 25 #include "content/browser/renderer_host/ime_adapter_android.h"
26 #include "content/browser/renderer_host/java/java_bound_object.h" 26 #include "content/browser/renderer_host/java/java_bound_object.h"
27 27
28 using content::SurfaceTexturePeerBrowserImpl; 28 using content::SurfaceTexturePeerBrowserImpl;
29 29
30 namespace { 30 namespace {
31 base::android::RegistrationMethod kContentRegisteredMethods[] = { 31 base::android::RegistrationMethod kContentRegisteredMethods[] = {
32 { "AndroidLocationApiAdapter", 32 { "AndroidLocationApiAdapter",
33 content::AndroidLocationApiAdapter::RegisterGeolocationService }, 33 content::AndroidLocationApiAdapter::RegisterGeolocationService },
34 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, 34 { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
35 { "ContentSettings", content::ContentSettings::RegisterContentSettings }, 35 { "ContentSettings", content::ContentSettings::RegisterContentSettings },
36 { "ContentViewRenderView", 36 { "ContentViewRenderView",
37 content::ContentViewRenderView::RegisterContentViewRenderView }, 37 content::ContentViewRenderView::RegisterContentViewRenderView },
38 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 38 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
39 { "ContentViewCore", content::RegisterContentViewCore }, 39 { "ContentViewCore", content::RegisterContentViewCore },
40 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 40 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
41 { "DownloadControllerAndroidImpl", 41 { "DownloadControllerAndroidImpl",
42 content::DownloadControllerAndroidImpl::RegisterDownloadController }, 42 content::DownloadControllerAndroidImpl::RegisterDownloadController },
43 { "InterstitialPageDelegateAndroid", 43 { "InterstitialPageDelegateAndroid",
44 content::InterstitialPageDelegateAndroid 44 content::InterstitialPageDelegateAndroid
45 ::RegisterInterstitialPageDelegateAndroid }, 45 ::RegisterInterstitialPageDelegateAndroid },
46 { "LoadUrlParams", content::RegisterLoadUrlParams }, 46 { "LoadUrlParams", content::RegisterLoadUrlParams },
47 { "RegisterImeAdapter", content::RegisterImeAdapter }, 47 { "RegisterImeAdapter", content::RegisterImeAdapter },
48 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, 48 { "ChildProcessLauncher", content::RegisterChildProcessLauncher },
Yaron 2013/03/08 03:10:31 Nit: alpha sort
kjyoun 2013/03/11 14:17:43 Done.
49 { "TouchPoint", content::RegisterTouchPoint }, 49 { "TouchPoint", content::RegisterTouchPoint },
50 { "TracingIntentHandler", content::RegisterTracingIntentHandler }, 50 { "TracingIntentHandler", content::RegisterTracingIntentHandler },
51 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, 51 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
52 { "WebViewStatics", content::RegisterWebViewStatics }, 52 { "WebViewStatics", content::RegisterWebViewStatics },
53 }; 53 };
54 54
55 } // namespace 55 } // namespace
56 56
57 namespace content { 57 namespace content {
58 namespace android { 58 namespace android {
59 59
60 bool RegisterBrowserJni(JNIEnv* env) { 60 bool RegisterBrowserJni(JNIEnv* env) {
61 return RegisterNativeMethods(env, kContentRegisteredMethods, 61 return RegisterNativeMethods(env, kContentRegisteredMethods,
62 arraysize(kContentRegisteredMethods)); 62 arraysize(kContentRegisteredMethods));
63 } 63 }
64 64
65 } // namespace android 65 } // namespace android
66 } // namespace content 66 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698