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 23965003: New SSL blocking screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Got the buttons working Created 7 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/ssl/blocking.css » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/> 58 <structure name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html " flattenhtml="true" type="chrome_html" variables="OOBE=oobe" expand_variables=" true"/>
59 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" /> 59 <structure name="IDR_OOBE_JS" file="resources\chromeos\login\oobe.js" fl attenhtml="true" type="chrome_html" />
60 <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\chromeos\l ogin\resource_loader.js" flattenhtml="true" type="chrome_html" /> 60 <structure name="IDR_OOBE_RESOURCE_LOADER_JS" file="resources\chromeos\l ogin\resource_loader.js" flattenhtml="true" type="chrome_html" />
61 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" /> 61 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
62 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 62 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
63 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 63 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
64 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 64 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
65 </if> 65 </if>
66 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 66 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
67 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 67 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" />
68 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> 69 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
69 </structures> 70 </structures>
70 <includes> 71 <includes>
71 <if expr="is_win"> 72 <if expr="is_win">
72 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 73 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
73 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 74 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
74 </if> 75 </if>
75 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 76 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
76 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 77 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
77 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" /> 78 <include name="IDR_ABOUT_MEMORY_JS" file="resources\about_memory.js" type= "BINDATA" />
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" /> 375 <include name="IDR_IDENTITY_INTERNALS_JS" file="resources\identity_inter nals.js" type="BINDATA" />
375 </if> 376 </if>
376 <if expr="pp_ifdef('chromeos')"> 377 <if expr="pp_ifdef('chromeos')">
377 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" /> 378 <include name="IDR_NETWORK_HTML" file="resources\chromeos\network.html" type="BINDATA" />
378 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" /> 379 <include name="IDR_NETWORK_JS" file="resources\chromeos\network.js" type ="BINDATA" />
379 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" /> 380 <include name="IDR_NETWORK_CSS" file="resources\chromeos\network.css" ty pe="BINDATA" />
380 </if> 381 </if>
381 </includes> 382 </includes>
382 </release> 383 </release>
383 </grit> 384 </grit>
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/ssl/blocking.css » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698