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

Unified Diff: content/public/browser/render_widget_host.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/public/browser/render_widget_host.h
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h
index 0114a01dce30cf69b60f1be6e55cd45052029f6e..7deb199d4b82c7c6616ee779c5bc13639148c06b 100644
--- a/content/public/browser/render_widget_host.h
+++ b/content/public/browser/render_widget_host.h
@@ -184,7 +184,7 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender {
const SkColorType color_type) = 0;
// Ensures that the view does not drop the backing store even when hidden.
virtual bool CanCopyFromBackingStore() = 0;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
virtual void LockBackingStore() = 0;
virtual void UnlockBackingStore() = 0;
#endif

Powered by Google App Engine
This is Rietveld 408576698