content/browser/media/media_web_contents_observer.cc - Issue 1411503005: Aura on Android: content/browser

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.cc

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/media/media_web_contents_observer.h ('K') | « content/browser/media/media_web_contents_observer.h ('k') | content/browser/power_save_blocker_impl.cc » ('j') | content/browser/power_save_blocker_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/media_web_contents_observer.cc

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

index 8e48e6878fc976a86faf837894ab68c1ba16418a..799cd9fcaef416f1f983fea48d73a2d884f37283 100644

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

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

@@ -31,7 +31,7 @@ MediaWebContentsObserver::~MediaWebContentsObserver() {

void MediaWebContentsObserver::RenderFrameDeleted(

RenderFrameHost* render_frame_host) {

-#if defined(OS_ANDROID)

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

no sievers 2015/10/22 20:55:40 keep here and below

mfomitchev 2015/11/02 21:51:15 Done.

uintptr_t key = reinterpret_cast<uintptr_t>(render_frame_host);

// Always destroy the media players before CDMs because we do not support

// detaching CDMs from media players yet. See http://crbug.com/330324

@@ -48,7 +48,7 @@ void MediaWebContentsObserver::RenderFrameDeleted(

browser_cdm_manager->RenderFrameDeleted(render_frame_host->GetRoutingID());

}

-#if defined(OS_ANDROID)

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

bool MediaWebContentsObserver::OnMessageReceived(

const IPC::Message& msg,