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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.h » ('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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 </if> 204 </if>
205 <if expr="pp_ifdef('enable_google_now')"> 205 <if expr="pp_ifdef('enable_google_now')">
206 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 206 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
207 </if> 207 </if>
208 <if expr="not pp_ifdef('android')"> 208 <if expr="not pp_ifdef('android')">
209 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" /> 209 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" />
210 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" /> 210 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" />
211 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" /> 211 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" />
212 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" /> 212 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" />
213 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" /> 213 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" />
214 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" />
215 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" />
214 </if> 216 </if>
215 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 217 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
216 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" /> 218 <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenht ml="true" allowexternalscript="true" type="BINDATA" />
217 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 219 <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid .html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
218 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" /> 220 <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml=" true" type="BINDATA" />
219 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 221 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
220 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 222 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
221 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" /> 223 <include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />
222 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" /> 224 <include name="IDR_UBER_FRAME_JS" file="resources\uber\uber_frame.js" flat tenhtml="true" type="BINDATA" />
223 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" /> 225 <include name="IDR_UBER_UTILS_JS" file="resources\uber\uber_utils.js" type ="BINDATA" />
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 310 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
309 </if> 311 </if>
310 <if expr="is_win"> 312 <if expr="is_win">
311 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 313 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
312 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 314 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
313 </if> 315 </if>
314 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 316 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
315 </includes> 317 </includes>
316 </release> 318 </release>
317 </grit> 319 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698