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

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

Issue 2550243002: Color the VR omnibox security icons. (Closed)
Patch Set: Created 4 years 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
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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 </if> 212 </if>
213 <if expr="is_android"> 213 <if expr="is_android">
214 <include name="IDR_OFFLINE_INTERNALS_HTML" file="resources\offline_pages \offline_internals.html" flattenhtml="true" allowexternalscript="true" type="BIN DATA" compress="gzip" /> 214 <include name="IDR_OFFLINE_INTERNALS_HTML" file="resources\offline_pages \offline_internals.html" flattenhtml="true" allowexternalscript="true" type="BIN DATA" compress="gzip" />
215 <include name="IDR_OFFLINE_INTERNALS_CSS" file="resources\offline_pages\ offline_internals.css" type="BINDATA" compress="gzip" /> 215 <include name="IDR_OFFLINE_INTERNALS_CSS" file="resources\offline_pages\ offline_internals.css" type="BINDATA" compress="gzip" />
216 <include name="IDR_OFFLINE_INTERNALS_JS" file="resources\offline_pages\o ffline_internals.js" type="BINDATA" compress="gzip" /> 216 <include name="IDR_OFFLINE_INTERNALS_JS" file="resources\offline_pages\o ffline_internals.js" type="BINDATA" compress="gzip" />
217 <include name="IDR_OFFLINE_INTERNALS_BROWSER_PROXY_JS" file="resources\o ffline_pages\offline_internals_browser_proxy.js" type="BINDATA" compress="gzip" /> 217 <include name="IDR_OFFLINE_INTERNALS_BROWSER_PROXY_JS" file="resources\o ffline_pages\offline_internals_browser_proxy.js" type="BINDATA" compress="gzip" />
218 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" /> 218 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
219 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" /> 219 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" />
220 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" /> 220 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" />
221 <if expr="enable_vr_shell or enable_webvr"> 221 <if expr="enable_vr_shell or enable_webvr">
222 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 222 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" type="BINDATA" />
cjgrant 2016/12/05 20:28:35 Note that alphabetization is happening here as wel
223 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" type="BINDATA" /> 223 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" type="BINDATA" />
224 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" type="BINDATA" />
225 <include name="IDR_VR_SHELL_UI_IMAGE_BACK" file="resources/vr_shell\im ages\back.svg" type="BINDATA" />
mthiesse 2016/12/05 20:57:30 s/\//\\
bshe 2016/12/05 21:08:38 I think you are likely to get push back from owner
cjgrant 2016/12/05 22:10:17 Ahh, yes, right! After thinking more, I have a fe
cjgrant 2016/12/06 15:52:00 Done (in new location).
226 <include name="IDR_VR_SHELL_UI_IMAGE_INFO" file="resources\vr_shell\im ages\info.svg" type="BINDATA" />
227 <include name="IDR_VR_SHELL_UI_IMAGE_LOCK" file="resources\vr_shell\im ages\lock.svg" type="BINDATA" />
228 <include name="IDR_VR_SHELL_UI_IMAGE_RELOAD" file="resources\vr_shell\ images\reload.svg" type="BINDATA" />
229 <include name="IDR_VR_SHELL_UI_IMAGE_WARNING" file="resources\vr_shell \images\warning.svg" type="BINDATA" />
224 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" type="BINDATA" /> 230 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" type="BINDATA" />
225 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" type="BINDATA" />
226 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" type="BINDATA" /> 231 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" type="BINDATA" />
227 </if> 232 </if>
228 </if> 233 </if>
229 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" /> 234 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" />
230 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" /> 235 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" />
231 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" /> 236 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" />
232 <if expr="enable_hangout_services_extension"> 237 <if expr="enable_hangout_services_extension">
233 <!-- Hangout Services extension, included in Google Chrome builds only. --> 238 <!-- Hangout Services extension, included in Google Chrome builds only. -->
234 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 239 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
235 </if> 240 </if>
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 612 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
608 </if> 613 </if>
609 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome_content_browser_manifest_overlay.json" use_base_dir="false" type= "BINDATA" /> 614 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome_content_browser_manifest_overlay.json" use_base_dir="false" type= "BINDATA" />
610 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" /> 615 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />
611 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" /> 616 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" />
612 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" /> 617 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />
613 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" /> 618 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />
614 </includes> 619 </includes>
615 </release> 620 </release>
616 </grit> 621 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/vr_shell/images/back.svg » ('j') | chrome/browser/resources/vr_shell/vr_shell_ui.css » ('J')

Powered by Google App Engine
This is Rietveld 408576698