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

Unified 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: rebased 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/android/sandboxed_process_service.cc ('k') | content/browser/android/child_process_launcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index e30394bb31591e321d8fce28a255262115a1d098..d15391b0c3dad13a937a1123e9bde2010b420e87 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "content/browser/android/android_browser_process.h"
+#include "content/browser/android/child_process_launcher.h"
#include "content/browser/android/content_settings.h"
#include "content/browser/android/content_video_view.h"
#include "content/browser/android/content_view_core_impl.h"
@@ -16,7 +17,6 @@
#include "content/browser/android/download_controller_android_impl.h"
#include "content/browser/android/interstitial_page_delegate_android.h"
#include "content/browser/android/load_url_params.h"
-#include "content/browser/android/sandboxed_process_launcher.h"
#include "content/browser/android/surface_texture_peer_browser_impl.h"
#include "content/browser/android/touch_point.h"
#include "content/browser/android/tracing_intent_handler.h"
@@ -32,6 +32,7 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
{ "AndroidLocationApiAdapter",
content::AndroidLocationApiAdapter::RegisterGeolocationService },
{ "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess },
+ { "ChildProcessLauncher", content::RegisterChildProcessLauncher },
{ "ContentSettings", content::ContentSettings::RegisterContentSettings },
{ "ContentViewRenderView",
content::ContentViewRenderView::RegisterContentViewRenderView },
@@ -45,7 +46,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
::RegisterInterstitialPageDelegateAndroid },
{ "LoadUrlParams", content::RegisterLoadUrlParams },
{ "RegisterImeAdapter", content::RegisterImeAdapter },
- { "SandboxedProcessLauncher", content::RegisterSandboxedProcessLauncher },
{ "TouchPoint", content::RegisterTouchPoint },
{ "TracingIntentHandler", content::RegisterTracingIntentHandler },
{ "WebContentsObserverAndroid", content::RegisterWebContentsObserverAndroid },
« no previous file with comments | « content/app/android/sandboxed_process_service.cc ('k') | content/browser/android/child_process_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698