content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java - 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/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/DeviceUtils.java ('k') | content/renderer/media/android/media_source_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java b/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java

index 6d9271eea32aa52f74161f9f3d4c5ce69f54c04e..4db35fe6122214f7a3085f8dfbd037bc523b79e9 100644

--- a/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java

+++ b/content/public/android/java/src/org/chromium/content/browser/PepperPluginManager.java

@@ -15,8 +15,6 @@ import android.content.pm.ServiceInfo;

import android.os.Bundle;

import android.util.Log;

-import org.chromium.base.ContextTypes;

import java.util.List;

/**

@@ -90,11 +88,6 @@ public class PepperPluginManager {

* @return Description string for plugins

public static String getPlugins(final Context context) {

- if (DeviceUtils.isTv(context) &&

- !ContextTypes.isRunningInWebapp(context)) {

- // Chrome-for-tv enables plugins only on webapp mode.

- return null;

- }

StringBuffer ret = new StringBuffer();

PackageManager pm = context.getPackageManager();

List<ResolveInfo> plugins = pm.queryIntentServices(