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

Unified Diff: content/browser/child_process_launcher_helper.h

Issue 2774163002: android: Java ChildProcessLauncherHelper instance (Closed)
Patch Set: explicit AddRef Created 3 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/browser/child_process_launcher.cc ('k') | content/browser/child_process_launcher_helper_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/child_process_launcher_helper.h
diff --git a/content/browser/child_process_launcher_helper.h b/content/browser/child_process_launcher_helper.h
index 5ca28b038d0515dee681d66fd189e98a0645e285..63dfdc0829302dcad4db376917ccc6f65c2bb30c 100644
--- a/content/browser/child_process_launcher_helper.h
+++ b/content/browser/child_process_launcher_helper.h
@@ -18,6 +18,10 @@
#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "services/catalog/public/cpp/manifest_parsing_util.h"
+#if defined(OS_ANDROID)
+#include "base/android/scoped_java_ref.h"
+#endif
+
#if defined(OS_WIN)
#include "sandbox/win/src/sandbox_types.h"
#else
@@ -133,7 +137,7 @@ class ChildProcessLauncherHelper :
// Returns the termination status and sets |exit_code| if non null.
// See ChildProcessLauncher::GetChildTerminationStatus for more info.
- static base::TerminationStatus GetTerminationStatus(
+ base::TerminationStatus GetTerminationStatus(
const ChildProcessLauncherHelper::Process& process,
bool known_dead,
int* exit_code);
@@ -153,8 +157,8 @@ class ChildProcessLauncherHelper :
static void ForceNormalProcessTerminationAsync(
ChildProcessLauncherHelper::Process process);
- static void SetProcessBackgroundedOnLauncherThread(
- base::Process process, bool background);
+ void SetProcessBackgroundedOnLauncherThread(base::Process process,
+ bool background);
static void SetRegisteredFilesForService(
const std::string& service_name,
@@ -162,6 +166,12 @@ class ChildProcessLauncherHelper :
static void ResetRegisteredFilesForTesting();
+#if defined(OS_ANDROID)
+ void OnChildProcessStarted(JNIEnv* env,
+ const base::android::JavaParamRef<jobject>& obj,
+ jint handle);
+#endif // OS_ANDROID
+
private:
friend class base::RefCountedThreadSafe<ChildProcessLauncherHelper>;
@@ -189,6 +199,10 @@ class ChildProcessLauncherHelper :
mojo::edk::ScopedPlatformHandle mojo_client_handle_;
mojo::edk::ScopedPlatformHandle mojo_server_handle_;
bool terminate_on_shutdown_;
+
+#if defined(OS_ANDROID)
+ base::android::ScopedJavaGlobalRef<jobject> java_peer_;
+#endif
};
} // namespace internal
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | content/browser/child_process_launcher_helper_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698