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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10905117: Safebrowsing malware interstitial UI tweaks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/safe_browsing/malware_block_v2.css » ('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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 </if> 44 </if>
45 <if expr="pp_ifdef('android')"> 45 <if expr="pp_ifdef('android')">
46 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" /> 46 <structure name="IDR_NEW_TAB_ANDROID_HTML" file="resources\ntp_android\n ew_tab.html" flattenhtml="true" type="chrome_html" />
47 </if> 47 </if>
48 <if expr="pp_ifdef('chromeos')"> 48 <if expr="pp_ifdef('chromeos')">
49 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" /> 49 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" />
50 </if> 50 </if>
51 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 51 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
52 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" /> 52 <structure name="IDR_SSL_ERROR_HTML" file="resources\ssl_error.html" flatt enhtml="true" type="chrome_html" />
53 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 53 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl_roadblock.ht ml" flattenhtml="true" type="chrome_html" />
54 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
54 </structures> 55 </structures>
55 <includes> 56 <includes>
56 <if expr="is_win"> 57 <if expr="is_win">
57 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 58 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
58 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 59 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
59 </if> 60 </if>
60 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 61 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
61 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 62 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
62 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" /> 63 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" />
63 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" /> 64 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" flatt enhtml="true" allowexternalscript="true" type="BINDATA" />
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY" 172 <include name="IDR_PRINT_PREVIEW_IMAGES_THIRD_PARTY"
172 file="resources\print_preview\images\third_party.png" type="BIN DATA" /> 173 file="resources\print_preview\images\third_party.png" type="BIN DATA" />
173 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE" 174 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE"
174 file="resources\print_preview\images\mobile.png" type="BINDATA" /> 175 file="resources\print_preview\images\mobile.png" type="BINDATA" />
175 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED" 176 <include name="IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED"
176 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" /> 177 file="resources\print_preview\images\mobile_shared.png" type="B INDATA" />
177 </if> 178 </if>
178 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 179 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
179 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 180 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
180 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 181 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
181 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_br owsing\malware_block_v2.html" flattenhtml="true" type="BINDATA" />
182 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 182 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
183 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 183 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
184 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestions _internals\suggestions_internals.html" flattenhtml="true" allowexternalscript="t rue" type="BINDATA" /> 184 <include name="IDR_SUGGESTIONS_INTERNALS_HTML" file="resources\suggestions _internals\suggestions_internals.html" flattenhtml="true" allowexternalscript="t rue" type="BINDATA" />
185 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestions_ internals\suggestions_internals.css" type="BINDATA" /> 185 <include name="IDR_SUGGESTIONS_INTERNALS_CSS" file="resources\suggestions_ internals\suggestions_internals.css" type="BINDATA" />
186 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_i nternals\suggestions_internals.js" type="BINDATA" /> 186 <include name="IDR_SUGGESTIONS_INTERNALS_JS" file="resources\suggestions_i nternals\suggestions_internals.js" type="BINDATA" />
187 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" /> 187 <include name="IDR_SUGGESTIONS_PAGE_CSS" file="resources\ntp4\suggestions_ page.css" type="BINDATA" />
188 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_p age.js" type="BINDATA" /> 188 <include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_p age.js" type="BINDATA" />
189 <if expr="not pp_ifdef('android')"> 189 <if expr="not pp_ifdef('android')">
190 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" /> 190 <include name="IDR_TRACING_HTML" file="..\..\third_party\trace-viewer\sr c\about_tracing.html" flattenhtml="true" allowexternalscript="true" type="BINDAT A" />
191 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" /> 191 <include name="IDR_TRACING_JS" file="..\..\third_party\trace-viewer\src\ about_tracing.js" flattenhtml="true" type="BINDATA" />
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 <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" />
278 <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" />
279 </if> 279 </if>
280 <if expr="is_win"> 280 <if expr="is_win">
281 <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" />
282 <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 " />
283 </if> 283 </if>
284 </includes> 284 </includes>
285 </release> 285 </release>
286 </grit> 286 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/safe_browsing/malware_block_v2.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698