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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/child_process_launcher_android.h
diff --git a/content/browser/android/child_process_launcher_android.h b/content/browser/android/child_process_launcher_android.h
index ea806ac557132af9ac39f842ff92bbc8ac9323fa..ef57c6bb60bf86a760e3499525e0e7e6384c2135 100644
--- a/content/browser/android/child_process_launcher_android.h
+++ b/content/browser/android/child_process_launcher_android.h
@@ -38,6 +38,7 @@ bool IsChildProcessOomProtected(base::ProcessHandle handle);
void SetChildProcessInForeground(base::ProcessHandle handle,
bool in_foreground);
+//#if !defined(USE_AURA)
no sievers 2015/10/20 19:24:22 this we should keep
void RegisterViewSurface(int surface_id, jobject j_surface);
void UnregisterViewSurface(int surface_id);
@@ -50,6 +51,7 @@ void DestroySurfaceTextureSurface(int surface_texture_id, int client_id);
gfx::ScopedJavaSurface GetSurfaceTextureSurface(int surface_texture_id,
int client_id);
+//#endif
bool RegisterChildProcessLauncher(JNIEnv* env);

Powered by Google App Engine
This is Rietveld 408576698