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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 318213002: Add custom interstitial for captive portals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix android tests, add more uma, address mmenke's comments Created 6 years, 6 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/captive_portal/captive_portal_tab_helper.h » ('j') | chrome/browser/captive_portal/captive_portal_tab_helper.h » ('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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" /> 69 <structure name="IDR_OOBE_ENROLLMENT_CSS" file="resources\chromeos\login \oobe_screen_oauth_enrollment.css" flattenhtml="true" type="chrome_html" />
70 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" /> 70 <structure name="IDR_OOBE_ENROLLMENT_JS" file="resources\chromeos\login\ oobe_screen_oauth_enrollment.js" flattenhtml="true" type="chrome_html" />
71 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" /> 71 <structure name="IDR_KEYBOARD_UTILS_JS" file="resources\chromeos\keyboar d\keyboard_utils.js" flattenhtml="true" type="chrome_html" />
72 <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network \network_config.js" flattenhtml="true" type="chrome_html" /> 72 <structure name="IDR_NETWORK_CONFIG_JS" file="resources\chromeos\network \network_config.js" flattenhtml="true" type="chrome_html" />
73 </if> 73 </if>
74 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" /> 74 <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_o f_date.html" flattenhtml="true" type="chrome_html" />
75 <structure name="IRD_SSL_INTERSTITIAL_V2_HTML" file="resources\ssl\interst itial_v2.html" flattenhtml="true" type="chrome_html" /> 75 <structure name="IRD_SSL_INTERSTITIAL_V2_HTML" file="resources\ssl\interst itial_v2.html" flattenhtml="true" type="chrome_html" />
76 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" /> 76 <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.ht ml" flattenhtml="true" type="chrome_html" />
77 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" /> 77 <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" />
78 <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_ browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" /> 78 <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_CAPTIVE_PORTAL_HTML" file="resources\ssl\captive_port al.html" flattenhtml="true" type="chrome_html" />
80
79 </structures> 81 </structures>
80 <includes> 82 <includes>
81 <if expr="is_win"> 83 <if expr="is_win">
82 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 84 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
83 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" /> 85 <include name="IDR_ABOUT_CONFLICTS_JS" file="resources\about_conflicts.j s" type="BINDATA" />
84 </if> 86 </if>
85 <if expr="not is_android"> 87 <if expr="not is_android">
86 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" /> 88 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" f lattenhtml="true" allowexternalscript="true" type="BINDATA" />
87 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" /> 89 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type= "BINDATA" />
88 </if> 90 </if>
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 412 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
411 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" /> 413 <include name="IDR_EASY_UNLOCK_MANIFEST" file="resources\easy_unlock\manif est.json" type="BINDATA" />
412 <if expr="chromeos"> 414 <if expr="chromeos">
413 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" /> 415 <include name="IDR_SET_TIME_HTML" file="resources\chromeos\set_time.html " type="BINDATA" />
414 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" /> 416 <include name="IDR_SET_TIME_CSS" file="resources\chromeos\set_time.css" type="BINDATA" />
415 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" /> 417 <include name="IDR_SET_TIME_JS" file="resources\chromeos\set_time.js" ty pe="BINDATA" />
416 </if> 418 </if>
417 </includes> 419 </includes>
418 </release> 420 </release>
419 </grit> 421 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/captive_portal/captive_portal_tab_helper.h » ('j') | chrome/browser/captive_portal/captive_portal_tab_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698