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

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 10911315: Move gpu blacklist data file to content side. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « build/android/pylib/single_test_runner.py ('k') | chrome/browser/chrome_browser_main.cc » ('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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 105 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
106 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 106 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
107 </if> 107 </if>
108 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 108 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
109 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
110 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 110 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
111 <if expr="not pp_ifdef('android')"> 111 <if expr="not pp_ifdef('android')">
112 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" /> 112 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html " flattenhtml="true" type="BINDATA" />
113 </if> 113 </if>
114 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 114 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
115 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" />
116 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 115 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
117 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 116 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
118 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 117 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
119 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 118 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
120 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 119 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
121 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 120 <include name="IDR_INSPECT_HTML" file="resources\inspect\inspect.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
122 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" /> 121 <include name="IDR_INSPECT_JS" file="resources\inspect\inspect.js" flatten html="true" type="BINDATA" />
123 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" /> 122 <include name="IDR_INSTANT_CSS" file="resources\instant\instant.css" flatt enhtml="true" type="BINDATA" />
124 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 123 <include name="IDR_INSTANT_HTML" file="resources\instant\instant.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
125 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" /> 124 <include name="IDR_INSTANT_JS" file="resources\instant\instant.js" flatten html="true" type="BINDATA" />
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" /> 277 <include name="IDR_GESTURE_CONFIG_HTML" file="resources\gesture_config.h tml" type="BINDATA" />
279 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 278 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
280 </if> 279 </if>
281 <if expr="is_win"> 280 <if expr="is_win">
282 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 281 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
283 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 282 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
284 </if> 283 </if>
285 </includes> 284 </includes>
286 </release> 285 </release>
287 </grit> 286 </grit>
OLDNEW
« no previous file with comments | « build/android/pylib/single_test_runner.py ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698