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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" /> 179 <include name="IDR_MOST_VISITED_THUMBNAIL_JS" file="resources\local_ntp\mo st_visited_thumbnail.js" type="BINDATA" />
180 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" /> 180 <include name="IDR_MOST_VISITED_UTIL_JS" file="resources\local_ntp\most_vi sited_util.js" type="BINDATA" flattenhtml="true" />
181 <include name="IDR_OMNIBOX_RESULT_LOADER_HTML" file="resources\omnibox_res ult_loader.html" type="BINDATA" /> 181 <include name="IDR_OMNIBOX_RESULT_LOADER_HTML" file="resources\omnibox_res ult_loader.html" type="BINDATA" />
182 <include name="IDR_OMNIBOX_RESULT_LOADER_JS" file="resources\omnibox_resul t_loader.js" type="BINDATA" flattenhtml="true" /> 182 <include name="IDR_OMNIBOX_RESULT_LOADER_JS" file="resources\omnibox_resul t_loader.js" type="BINDATA" flattenhtml="true" />
183 <include name="IDR_OMNIBOX_RESULT_HTML" file="resources\omnibox_result.htm l" type="BINDATA" /> 183 <include name="IDR_OMNIBOX_RESULT_HTML" file="resources\omnibox_result.htm l" type="BINDATA" />
184 <include name="IDR_OMNIBOX_RESULT_JS" file="resources\omnibox_result.js" t ype="BINDATA" /> 184 <include name="IDR_OMNIBOX_RESULT_JS" file="resources\omnibox_result.js" t ype="BINDATA" />
185 185
186 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 186 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
187 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 187 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
188 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 188 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
189 <if expr="not is_android"> 189 <if expr="not is_android or pp_ifdef('google_tv')">
190 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 190 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
191 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " /> 191 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA " />
192 </if> 192 </if>
193 <if expr="is_android and pp_ifdef('google_tv')">
194 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_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
195 </if>
193 <if expr="is_win"> 196 <if expr="is_win">
194 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" /> 197 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_win.json" type="BINDATA" />
195 </if> 198 </if>
196 <if expr="is_macosx"> 199 <if expr="is_macosx">
197 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" /> 200 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugi ns_mac.json" type="BINDATA" />
198 </if> 201 </if>
199 <if expr="is_linux"> 202 <if expr="is_linux">
200 <if expr="pp_ifdef('chromeos')"> 203 <if expr="pp_ifdef('chromeos')">
201 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plu gins_chromeos.json" type="BINDATA" /> 204 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plu gins_chromeos.json" type="BINDATA" />
202 </if> 205 </if>
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 360 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
358 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" /> 361 <include name="IDR_MANAGED_USER_PASSPHRASE_DIALOG_JS" file="resources\mana ged_user_passphrase_dialog.js" type="BINDATA" />
359 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" /> 362 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_HTML" file="resources\profi le_signin_confirmation.html" type="BINDATA" />
360 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" /> 363 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_JS" file="resources\profile _signin_confirmation.js" type="BINDATA" />
361 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" /> 364 <include name="IDR_PROFILE_SIGNIN_CONFIRMATION_CSS" file="resources\profil e_signin_confirmation.css" type="BINDATA" />
362 365
363 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" /> 366 <include name="IDR_RECENTLY_CLOSED_WINDOW" file="resources\ntp4\images\clo sed_window.png" type="BINDATA" />
364 </includes> 367 </includes>
365 </release> 368 </release>
366 </grit> 369 </grit>
OLDNEW
« 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