Commit 7a2ce049 authored by kjyoun@google.com's avatar kjyoun@google.com

Add plugin list for Chrome for TV

Previously, Chrome for TV used plugin list of linux, though it was not right one,
since Android used resource for linux by default.
But, with https://codereview.chromium.org/14834011,
Android and Linux resource was separated cleanly.
As a result, Chrome for TV, based on Android, needs its own plugin list.

BUG=

Review URL: https://chromiumcodereview.appspot.com/15978002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202492 0039d316-1c4b-4281-b951-d872f2087c98
parent ad63985e
...@@ -1503,6 +1503,11 @@ ...@@ -1503,6 +1503,11 @@
['OS=="android"', { ['OS=="android"', {
'grit_defines': ['-t', 'android', 'grit_defines': ['-t', 'android',
'-E', 'ANDROID_JAVA_TAGGED_ONLY=true'], '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'],
'conditions': [
['google_tv==1', {
'grit_defines': ['-D', 'google_tv'],
}],
],
}], }],
['OS=="mac"', { ['OS=="mac"', {
'grit_defines': ['-D', 'scale_factors=2x'], 'grit_defines': ['-D', 'scale_factors=2x'],
......
...@@ -187,10 +187,13 @@ ...@@ -187,10 +187,13 @@
<include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type="BINDATA" /> <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type="BINDATA" />
<include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="BINDATA" /> <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="BINDATA" />
<if expr="not is_android"> <if expr="not is_android or pp_ifdef('google_tv')">
<include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" /> <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
</if> </if>
<if expr="is_android and pp_ifdef('google_tv')">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_tv.json" type="BINDATA" />
</if>
<if expr="is_win"> <if expr="is_win">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_win.json" type="BINDATA" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_win.json" type="BINDATA" />
</if> </if>
......
{
"netflix": {
"mime_types": [
],
"versions": [
{
"version": "0",
"status": "up_to_date",
"comment": "'Netflix' is bundled with GoogleTV, so we don't define a minimum version."
}
],
"name": "Netflix",
"group_name_matcher": "*Netflix*"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment