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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 656523002: fix naming of security interstitial resource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/safe_browsing_blocking_page.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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" /> 71 <structure name="IDR_OOBE_ENROLLMENT_HTML" file="resources\chromeos\logi n\oobe_screen_oauth_enrollment.html" flattenhtml="true" type="chrome_html" />
72 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
73 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 73 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
74 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 74 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
75 <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network \network_config.js" flattenhtml="true" type="chrome_html" /> 75 <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network \network_config.js" flattenhtml="true" type="chrome_html" />
76 <!-- TODO(dzhioev): move polymer to chrome://resources when 76 <!-- TODO(dzhioev): move polymer to chrome://resources when
77 http://crbug.com/418199 is fixed. --> 77 http://crbug.com/418199 is fixed. -->
78 <part file="polymer_resources.grdp" /> 78 <part file="polymer_resources.grdp" />
79 </if> 79 </if>
80 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 80 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
81 <structure name="IRD_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" /> 81 <structure name="IDR_SECURITY_INTERSTITIAL_HTML" file="resources\security_ warnings\interstitial_v2.html" flattenhtml="true" type="chrome_html" />
82 </structures> 82 </structures>
83 <includes> 83 <includes>
84 <if expr="is_win"> 84 <if expr="is_win">
85 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 85 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
86 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 86 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
87 </if> 87 </if>
88 <if expr="not is_android"> 88 <if expr="not is_android">
89 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" /> 89 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />
90 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" /> 90 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />
91 </if> 91 </if>
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 439 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
440 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 440 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
441 </if> 441 </if>
442 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 442 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
443 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 443 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
444 </if> 444 </if>
445 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" /> 445 <include name="IDR_WHISPERNET_PROXY_MANIFEST" file="resources\whispernet_p roxy\manifest.json" type="BINDATA" />
446 </includes> 446 </includes>
447 </release> 447 </release>
448 </grit> 448 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698