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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 141363006: Proof of concept of ignoring x-frame-options for sign-in webui. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix crash Created 6 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 | « no previous file | chrome/browser/chrome_content_browser_client.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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 </if> 261 </if>
262 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 262 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
263 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 263 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
264 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 264 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
265 <if expr="pp_ifdef('enable_settings_app')"> 265 <if expr="pp_ifdef('enable_settings_app')">
266 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" /> 266 <include name="IDR_SETTINGS_APP_MANIFEST" file="resources\settings_app\m anifest.json" type="BINDATA" />
267 </if> 267 </if>
268 <if expr="pp_ifdef('enable_google_now')"> 268 <if expr="pp_ifdef('enable_google_now')">
269 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" /> 269 <include name="IDR_GOOGLE_NOW_MANIFEST" file="resources\google_now\manif est.json" type="BINDATA" />
270 </if> 270 </if>
271 <include name="IDR_SIGNIN_HTML" file="resources\signin.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA" />
271 <if expr="not is_android"> 272 <if expr="not is_android">
272 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" /> 273 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestio ns_internals\suggestions_internals.html" flattenhtml="true" allowexternalscript= "true" type="BINDATA" />
273 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" /> 274 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestion s_internals\suggestions_internals.css" type="BINDATA" />
274 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" /> 275 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions _internals\suggestions_internals.js" type="BINDATA" />
275 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" /> 276 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestion s_page.css" type="BINDATA" />
276 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" /> 277 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions _page.js" type="BINDATA" />
277 </if> 278 </if>
278 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 279 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
279 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" /> 280 <include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml= "true" type="BINDATA" />
280 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / > 281 <include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" / >
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" /> 415 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" />
415 </if> 416 </if>
416 <if expr="pp_ifdef('chromeos')"> 417 <if expr="pp_ifdef('chromeos')">
417 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 418 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
418 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 419 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
419 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 420 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
420 </if> 421 </if>
421 </includes> 422 </includes>
422 </release> 423 </release>
423 </grit> 424 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698