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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/frame_host/render_widget_host_view_guest.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
« content/browser/frame_host/render_widget_host_view_child_frame.cc ('K') | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/frame_host/render_widget_host_view_guest.cc » ('j') | content/browser/media/media_web_contents_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2ff172ee84654078ea2ec2567bae8162ead560b8..25675a690621ddfc85febe92b0a107bf8ea3be4f 100644
--- a/content/browser/frame_host/render_widget_host_view_guest.h
+++ b/content/browser/frame_host/render_widget_host_view_guest.h
@@ -125,7 +125,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)
« content/browser/frame_host/render_widget_host_view_child_frame.cc ('K') | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/frame_host/render_widget_host_view_guest.cc » ('j') | content/browser/media/media_web_contents_observer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698