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

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.h

Issue 1411503005: Aura on Android: content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_select_file
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/frame_host/render_widget_host_view_child_frame.h
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.h b/content/browser/frame_host/render_widget_host_view_child_frame.h
index 68fed3013022381adfb2298a5fe453bfb7b4bed0..b589040e31f26634b3e8e781641e384ed3c4b290 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.h
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.h
@@ -139,7 +139,7 @@ class CONTENT_EXPORT RenderWidgetHostViewChildFrame
#endif // defined(OS_MACOSX)
// RenderWidgetHostViewBase implementation.
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
void LockCompositingSurface() override;
void UnlockCompositingSurface() override;
#endif // defined(OS_ANDROID)

Powered by Google App Engine
This is Rietveld 408576698