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

Side by Side Diff: content/browser/android/child_process_launcher_android.h

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 #ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
6 #define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ 6 #define CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <map> 9 #include <map>
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 // Stops a child process based on the handle returned form 32 // Stops a child process based on the handle returned form
33 // StartChildProcess. 33 // StartChildProcess.
34 void StopChildProcess(base::ProcessHandle handle); 34 void StopChildProcess(base::ProcessHandle handle);
35 35
36 bool IsChildProcessOomProtected(base::ProcessHandle handle); 36 bool IsChildProcessOomProtected(base::ProcessHandle handle);
37 37
38 void SetChildProcessInForeground(base::ProcessHandle handle, 38 void SetChildProcessInForeground(base::ProcessHandle handle,
39 bool in_foreground); 39 bool in_foreground);
40 40
41 //#if !defined(USE_AURA)
no sievers 2015/10/20 19:24:22 this we should keep
41 void RegisterViewSurface(int surface_id, jobject j_surface); 42 void RegisterViewSurface(int surface_id, jobject j_surface);
42 43
43 void UnregisterViewSurface(int surface_id); 44 void UnregisterViewSurface(int surface_id);
44 45
45 void CreateSurfaceTextureSurface(int surface_texture_id, 46 void CreateSurfaceTextureSurface(int surface_texture_id,
46 int client_id, 47 int client_id,
47 gfx::SurfaceTexture* surface_texture); 48 gfx::SurfaceTexture* surface_texture);
48 49
49 void DestroySurfaceTextureSurface(int surface_texture_id, int client_id); 50 void DestroySurfaceTextureSurface(int surface_texture_id, int client_id);
50 51
51 gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id, 52 gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
52 int client_id); 53 int client_id);
54 //#endif
53 55
54 bool RegisterChildProcessLauncher(JNIEnv* env); 56 bool RegisterChildProcessLauncher(JNIEnv* env);
55 57
56 } // namespace content 58 } // namespace content
57 59
58 #endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_ 60 #endif // CONTENT_BROWSER_ANDROID_CHILD_PROCESS_LAUNCHER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698