content/browser/media/media_web_contents_observer.h - Issue 1391893003: NOT FOR REVIEW: Aura on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/media_web_contents_observer.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:

Index: content/browser/media/media_web_contents_observer.h

diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h

index 8fbe08084fa1428562b9bfbeba47544cd29f0fcc..4c557e02bd74e94e12e29592f5387e2d7c1bd470 100644

--- a/content/browser/media/media_web_contents_observer.h

+++ b/content/browser/media/media_web_contents_observer.h

@@ -32,7 +32,7 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {

// WebContentsObserver implementations.

void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) && !defined(USE_AURA)

no sievers 2015/10/20 19:24:22 this we should keep

bool OnMessageReceived(const IPC::Message& message,

RenderFrameHost* render_frame_host) override;