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

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.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/frame_host/render_widget_host_view_guest.h
diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
index 8ab05e925c03f9bbc1bfdac39a6e8f1dfcf1a1a0..8354189b4220bc4b01430fbe1c969b21ba787fdd 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.h
+++ b/content/browser/frame_host/render_widget_host_view_guest.h
@@ -123,7 +123,7 @@ class CONTENT_EXPORT RenderWidgetHostViewGuest
const SkBitmap& zoomed_bitmap) override;
#endif // defined(OS_ANDROID) || defined(USE_AURA)
-#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