Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2105)

Unified Diff: chrome/browser/browser_resources.grd

Issue 15978002: Add plugin list for Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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 | « build/common.gypi ('k') | chrome/browser/resources/plugin_metadata/plugins_tv.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index c652930285b2af3e4fc5eb542213d4c5f0220670..418d807733c7eae262bdea8b76d0904289b01b00 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -186,10 +186,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" />
Bernhard Bauer 2013/05/24 06:02:54 Is "tv" a platform? I.e., do we have _tv.{h,cc} fi
kjyoun 2013/05/24 08:19:22 Currently, tv itself is not a platform for now. Ra
+ </if>
<if expr="is_win">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_win.json" type="BINDATA" />
</if>
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/resources/plugin_metadata/plugins_tv.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698