Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 608 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 619 </if> | 619 </if> |
| 620 <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" /> | 620 <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" /> |
| 621 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" /> | 621 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" /> |
| 622 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" /> | 622 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" /> |
| 623 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" /> | 623 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" /> |
| 624 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" /> | 624 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" /> |
| 625 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" /> | 625 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" /> |
| 626 <if expr="is_win"> | 626 <if expr="is_win"> |
| 627 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" /> | 627 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" /> |
| 628 </if> | 628 </if> |
| 629 <if expr="not is_android and not is_ios"> | |
|
estark
2017/01/12 18:54:43
Can we not do the captive portal list on mobile fo
meacer
2017/01/12 23:54:02
I eventually want to enable this for mobile as wel
estark
2017/01/13 23:40:23
Yep, sgtm
| |
| 630 <include name="IDR_TLS_ERROR_ASSISTANT_PB" file="${root_gen_dir}\chrome\ browser\resources\ssl\tls_error_assistant\tls_error_assistant.pb" use_base_dir=" false" type="BINDATA" /> | |
| 631 </if> | |
| 629 </includes> | 632 </includes> |
| 630 </release> | 633 </release> |
| 631 </grit> | 634 </grit> |
| OLD | NEW |