content/browser/media/android/browser_media_player_manager.cc - Issue 136343002: Remove Chrome for TV code.

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/android/browser_media_player_manager.cc

Issue 136343002: Remove Chrome for TV code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 years, 11 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/android/browser_media_player_manager.cc

diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc

index 77ce9d14aed21e7c9752d5d762cb77114f77d2b3..04cde982cd114f242c619d739d6aad97dde11b4b 100644

--- a/content/browser/media/android/browser_media_player_manager.cc

+++ b/content/browser/media/android/browser_media_player_manager.cc

@@ -64,7 +64,6 @@ ContentViewCoreImpl* BrowserMediaPlayerManager::GetContentViewCore() const {

return ContentViewCoreImpl::FromWebContents(web_contents());

}

-#if !defined(GOOGLE_TV)

// static

MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(

MediaPlayerHostMsg_Initialize_Type type,

@@ -112,7 +111,6 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer(

NOTREACHED();

return NULL;

}

-#endif

BrowserMediaPlayerManager::BrowserMediaPlayerManager(

RenderViewHost* render_view_host)