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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2661823002: NOT FOR REVIEW: A set of patches for Josh to work on top of. (Closed)
Patch Set: Created 3 years, 10 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 | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/resources/vr_shell/vk.css » ('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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 <include name="IDR_OFFLINE_INTERNALS_BROWSER_PROXY_JS" file="resources\o ffline_pages\offline_internals_browser_proxy.js" type="BINDATA" compress="gzip" /> 219 <include name="IDR_OFFLINE_INTERNALS_BROWSER_PROXY_JS" file="resources\o ffline_pages\offline_internals_browser_proxy.js" type="BINDATA" compress="gzip" />
220 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" /> 220 <include name="IDR_SNIPPETS_INTERNALS_HTML" file="resources\snippets_int ernals.html" allowexternalscript="true" compress="gzip" type="BINDATA" />
221 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" /> 221 <include name="IDR_SNIPPETS_INTERNALS_CSS" file="resources\snippets_inte rnals.css" compress="gzip" type="BINDATA" />
222 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" /> 222 <include name="IDR_SNIPPETS_INTERNALS_JS" file="resources\snippets_inter nals.js" compress="gzip" type="BINDATA" />
223 <if expr="enable_vr_shell or enable_webvr"> 223 <if expr="enable_vr_shell or enable_webvr">
224 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" compress="gzip" type="BI NDATA" /> 224 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" compress="gzip" type="BI NDATA" />
225 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" compress="gzip" type="BINDATA" /> 225 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" compress="gzip" type="BINDATA" />
226 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" compress="gzip" type="BINDATA" /> 226 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" compress="gzip" type="BINDATA" />
227 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" compress="gzip" type="BINDATA" /> 227 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" compress="gzip" type="BINDATA" />
228 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" compress="gzip" type="BINDATA" /> 228 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" compress="gzip" type="BINDATA" />
229 <include name="IDR_VR_SHELL_UI_VK_HTML" file="resources\vr_shell\vk.ht ml" allowexternalscript="true" flattenhtml="true" compress="gzip" type="BINDATA" />
230 <include name="IDR_VR_SHELL_UI_VK_CSS" file="resources\vr_shell\vk.css " compress="gzip" type="BINDATA" />
231 <include name="IDR_VR_SHELL_UI_VK_JS" file="resources\vr_shell\vk.js" compress="gzip" type="BINDATA" />
229 </if> 232 </if>
230 </if> 233 </if>
231 <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" />
232 <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" />
233 <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" />
234 <if expr="enable_hangout_services_extension"> 237 <if expr="enable_hangout_services_extension">
235 <!-- Hangout Services extension, included in Google Chrome builds only. --> 238 <!-- Hangout Services extension, included in Google Chrome builds only. -->
236 <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" />
237 </if> 240 </if>
238 <if expr="enable_hotwording"> 241 <if expr="enable_hotwording">
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="${root_ge n_dir}\chrome\app\chrome_content_plugin_manifest_overlay.json" type="BINDATA" us e_base_dir="false" /> 632 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="${root_ge n_dir}\chrome\app\chrome_content_plugin_manifest_overlay.json" type="BINDATA" us e_base_dir="false" />
630 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="${root_ gen_dir}\chrome\app\chrome_content_renderer_manifest_overlay.json" type="BINDATA " use_base_dir="false" /> 633 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="${root_ gen_dir}\chrome\app\chrome_content_renderer_manifest_overlay.json" type="BINDATA " use_base_dir="false" />
631 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome\app\chrome_content_utility_manifest_overlay.json" type="BINDATA" use_base_dir="false" /> 634 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="${root_g en_dir}\chrome\app\chrome_content_utility_manifest_overlay.json" type="BINDATA" use_base_dir="false" />
632 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" /> 635 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" />
633 <if expr="is_win"> 636 <if expr="is_win">
634 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" /> 637 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" />
635 </if> 638 </if>
636 </includes> 639 </includes>
637 </release> 640 </release>
638 </grit> 641 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/resources/vr_shell/vk.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698