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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/public/browser/web_contents.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/public/browser/BUILD.gn ('K') | « content/public/browser/render_widget_host.h ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/web_contents.h
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 08c5ba9b8f2f01c84cede287381a1c8f718d165b..8ab0b69be9881c616c97eda50efb0e235193ec0f 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -672,7 +672,7 @@ class WebContents : public PageNavigator,
// as soon as they are ready.
virtual void ResumeLoadingCreatedWebContents() = 0;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
// Requests to resume the current media session.
virtual void ResumeMediaSession() = 0;
// Requests to suspend the current media session.
« content/public/browser/BUILD.gn ('K') | « content/public/browser/render_widget_host.h ('k') | content/public/test/android/javatests/src/org/chromium/content/browser/test/NativeLibraryTestBase.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698