content/child/runtime_features.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/child/runtime_features.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/child/runtime_features.cc

diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc

index 5352e56163c6e25bf3ea655e7b4012d3988d348b..b907e90dd0fc886b94a90e05b091abb9ae4734e4 100644

--- a/content/child/runtime_features.cc

+++ b/content/child/runtime_features.cc

@@ -19,14 +19,12 @@ namespace content {

static void SetRuntimeFeatureDefaultsForPlatform() {

#if defined(OS_ANDROID)

-#if !defined(GOOGLE_TV)

// MSE/EME implementation needs Android MediaCodec API.

if (!media::MediaCodecBridge::IsAvailable()) {

WebRuntimeFeatures::enableWebKitMediaSource(false);

WebRuntimeFeatures::enableMediaSource(false);

WebRuntimeFeatures::enablePrefixedEncryptedMedia(false);

}

-#endif // !defined(GOOGLE_TV)

// WebAudio is enabled by default only on ARM and only when the

// MediaCodec API is available.

WebRuntimeFeatures::enableWebAudio(