diff options
| author | kjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 03:20:35 +0000 |
|---|---|---|
| committer | kjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 03:20:35 +0000 |
| commit | 7a2ce049b7b531ffa930fd4cea0ee189e6266763 (patch) | |
| tree | a3ee4250c6ce2c835c5861dd24c54a1f8764b7cb | |
| parent | ad63985e80be3497a9faf3aaa52127682544eda0 (diff) | |
| download | chromium_src-7a2ce049b7b531ffa930fd4cea0ee189e6266763.zip chromium_src-7a2ce049b7b531ffa930fd4cea0ee189e6266763.tar.gz chromium_src-7a2ce049b7b531ffa930fd4cea0ee189e6266763.tar.bz2 | |
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
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | chrome/browser/browser_resources.grd | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/plugin_metadata/plugins_tv.json | 15 |
3 files changed, 24 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7d3924b..b994f48 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1503,6 +1503,11 @@ ['OS=="android"', { 'grit_defines': ['-t', 'android', '-E', 'ANDROID_JAVA_TAGGED_ONLY=true'], + 'conditions': [ + ['google_tv==1', { + 'grit_defines': ['-D', 'google_tv'], + }], + ], }], ['OS=="mac"', { 'grit_defines': ['-D', 'scale_factors=2x'], diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index d45400c..165202e 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd @@ -187,10 +187,13 @@ <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_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_JS" file="resources\plugins.js" type="BINDATA" /> </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"> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_win.json" type="BINDATA" /> </if> diff --git a/chrome/browser/resources/plugin_metadata/plugins_tv.json b/chrome/browser/resources/plugin_metadata/plugins_tv.json new file mode 100644 index 0000000..23054f4 --- /dev/null +++ b/chrome/browser/resources/plugin_metadata/plugins_tv.json @@ -0,0 +1,15 @@ +{ + "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*" + } +} |