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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2363553003: VrShell: implement insecure content warning display (Closed)
Patch Set: Replace GIMP images with PNG file resources Created 4 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
« chrome/browser/android/vr_shell/vr_shell_renderer.cc ('K') | « chrome/browser/android/vr_shell/vr_shell_renderer.cc ('k') | chrome/browser/resources/vr_shell/webvr_not_secure_permanent.png » ('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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 <include name="IDR_POPULAR_SITES_INTERNALS_CSS" file="resources\popular_ sites_internals.css" compress="gzip" type="BINDATA" /> 199 <include name="IDR_POPULAR_SITES_INTERNALS_CSS" file="resources\popular_ sites_internals.css" compress="gzip" type="BINDATA" />
200 <include name="IDR_POPULAR_SITES_INTERNALS_JS" file="resources\popular_s ites_internals.js" compress="gzip" type="BINDATA" /> 200 <include name="IDR_POPULAR_SITES_INTERNALS_JS" file="resources\popular_s ites_internals.js" compress="gzip" type="BINDATA" />
201 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" /> 201 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
202 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" /> 202 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" />
203 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" /> 203 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" />
204 <!-- TODO: Enable only for VrShell, independent of Android. --> 204 <!-- TODO: Enable only for VrShell, independent of Android. -->
205 <if expr="enable_vr_shell"> 205 <if expr="enable_vr_shell">
206 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" compress="gzip" type="BI NDATA" /> 206 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" compress="gzip" type="BI NDATA" />
207 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" compress="gzip" type="BINDATA" /> 207 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" compress="gzip" type="BINDATA" />
208 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" compress="gzip" type="BINDATA" /> 208 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" compress="gzip" type="BINDATA" />
209 <include name="IDR_VR_SHELL_WEBVR_NOT_SECURE_PERMANENT_PNG" file="reso urces\vr_shell\webvr_not_secure_permanent.png" type="BINDATA" />
210 <include name="IDR_VR_SHELL_WEBVR_NOT_SECURE_TRANSIENT_PNG" file="reso urces\vr_shell\webvr_not_secure_transient.png" type="BINDATA" />
209 </if> 211 </if>
210 </if> 212 </if>
211 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" /> 213 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" />
212 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" /> 214 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" />
213 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" /> 215 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" />
214 <if expr="_google_chrome or enable_hangout_services_extension"> 216 <if expr="_google_chrome or enable_hangout_services_extension">
215 <!-- Hangout Services extension, included in Google Chrome builds only. --> 217 <!-- Hangout Services extension, included in Google Chrome builds only. -->
216 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 218 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
217 </if> 219 </if>
218 <if expr="enable_hotwording"> 220 <if expr="enable_hotwording">
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 </if> 588 </if>
587 <if expr="not is_android and not is_ios"> 589 <if expr="not is_android and not is_ios">
588 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 590 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
589 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 591 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
590 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 592 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
591 </if> 593 </if>
592 <include name="IDR_CONTENT_BROWSER_MANIFEST_OVERLAY" file="content_browser _manifest_overlay.json" type="BINDATA" /> 594 <include name="IDR_CONTENT_BROWSER_MANIFEST_OVERLAY" file="content_browser _manifest_overlay.json" type="BINDATA" />
593 </includes> 595 </includes>
594 </release> 596 </release>
595 </grit> 597 </grit>
OLDNEW
« chrome/browser/android/vr_shell/vr_shell_renderer.cc ('K') | « chrome/browser/android/vr_shell/vr_shell_renderer.cc ('k') | chrome/browser/resources/vr_shell/webvr_not_secure_permanent.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698