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

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

Issue 68723003: Make chrome/ be documentElement/body agnostic with regards to scrollTop/Left (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_305800
Patch Set: Created 7 years, 1 month 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 | « no previous file | chrome/browser/resources/about_memory.js » ('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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" /> 78 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" />
79 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> 79 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
80 </structures> 80 </structures>
81 <includes> 81 <includes>
82 <if expr="is_win"> 82 <if expr="is_win">
83 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 83 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
84 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 84 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
85 </if> 85 </if>
86 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 86 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
87 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 87 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
88 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" /> 88 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" flatt enhtml="true" type="BINDATA" />
89 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 89 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
90 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatten html="true" type="chrome_html" /> 90 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatten html="true" type="chrome_html" />
91 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BIN DATA" /> 91 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="BIN DATA" />
92 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 92 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
93 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" /> 93 <include name="IDR_ABOUT_STATS_JS" file="resources\about_stats.js" type="B INDATA" />
94 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" /> 94 <include name="IDR_ABOUT_VERSION_JS" file="resources\about_version.js" typ e="BINDATA" />
95 <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" t ype="BINDATA" /> 95 <include name="IDR_ABOUT_VERSION_CSS" file="resources\about_version.css" t ype="BINDATA" />
96 <if expr="is_android"> 96 <if expr="is_android">
97 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" /> 97 <include name="IDR_ABOUT_WELCOME_JS" file="resources\about_welcome_andro id\about_welcome_android.js" type="BINDATA" />
98 </if> 98 </if>
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 </if> 404 </if>
405 <if expr="pp_ifdef('chromeos')"> 405 <if expr="pp_ifdef('chromeos')">
406 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" /> 406 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" />
407 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 407 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
408 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 408 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
409 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 409 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
410 </if> 410 </if>
411 </includes> 411 </includes>
412 </release> 412 </release>
413 </grit> 413 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/about_memory.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698