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

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: 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
(...skipping 10 matching lines...) Expand all
40 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView }, 40 { "ContentVideoView", content::ContentVideoView::RegisterContentVideoView },
41 { "ContentViewCore", content::RegisterContentViewCore }, 41 { "ContentViewCore", content::RegisterContentViewCore },
42 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid}, 42 { "DateTimePickerAndroid", content::RegisterDateTimeChooserAndroid},
43 { "DownloadControllerAndroidImpl", 43 { "DownloadControllerAndroidImpl",
44 content::DownloadControllerAndroidImpl::RegisterDownloadController }, 44 content::DownloadControllerAndroidImpl::RegisterDownloadController },
45 { "InterstitialPageDelegateAndroid", 45 { "InterstitialPageDelegateAndroid",
46 content::InterstitialPageDelegateAndroid 46 content::InterstitialPageDelegateAndroid
47 ::RegisterInterstitialPageDelegateAndroid }, 47 ::RegisterInterstitialPageDelegateAndroid },
48 { "LoadUrlParams", content::RegisterLoadUrlParams }, 48 { "LoadUrlParams", content::RegisterLoadUrlParams },
49 { "RegisterImeAdapter", content::RegisterImeAdapter }, 49 { "RegisterImeAdapter", content::RegisterImeAdapter },
50 { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher }, 50 { "ChildProcessLauncher", content::RegisterChildProcessLauncher },
51 { "TouchPoint", content::RegisterTouchPoint }, 51 { "TouchPoint", content::RegisterTouchPoint },
52 { "TracingIntentHandler", content::RegisterTracingIntentHandler }, 52 { "TracingIntentHandler", content::RegisterTracingIntentHandler },
53 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid }, 53 { "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
54 { "WebViewStatics", content::RegisterWebViewStatics }, 54 { "WebViewStatics", content::RegisterWebViewStatics },
55 }; 55 };
56 56
57 } // namespace 57 } // namespace
58 58
59 namespace content { 59 namespace content {
60 namespace android { 60 namespace android {
61 61
62 bool RegisterBrowserJni(JNIEnv* env) { 62 bool RegisterBrowserJni(JNIEnv* env) {
63 return RegisterNativeMethods(env, kContentRegisteredMethods, 63 return RegisterNativeMethods(env, kContentRegisteredMethods,
64 arraysize(kContentRegisteredMethods)); 64 arraysize(kContentRegisteredMethods));
65 } 65 }
66 66
67 } // namespace android 67 } // namespace android
68 } // namespace content 68 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698