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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2567983007: bluetooth: Add adapter page to internals page. (Closed)
Patch Set: Merge upstream Created 3 years, 11 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 | « no previous file | chrome/browser/resources/bluetooth_internals/adapter_broker.js » ('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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 </if> 94 </if>
95 <if expr="not is_android"> 95 <if expr="not is_android">
96 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" /> 96 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" />
97 </if> 97 </if>
98 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" /> 98 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" />
99 <include name="IDR_BLUETOOTH_ADAPTER_MOJO_JS" file="${root_gen_dir}\device \bluetooth\public\interfaces\adapter.mojom.js" use_base_dir="false" type="BINDAT A" compress="gzip" /> 99 <include name="IDR_BLUETOOTH_ADAPTER_MOJO_JS" file="${root_gen_dir}\device \bluetooth\public\interfaces\adapter.mojom.js" use_base_dir="false" type="BINDAT A" compress="gzip" />
100 <include name="IDR_BLUETOOTH_DEVICE_MOJO_JS" file="${root_gen_dir}\device\ bluetooth\public\interfaces\device.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" /> 100 <include name="IDR_BLUETOOTH_DEVICE_MOJO_JS" file="${root_gen_dir}\device\ bluetooth\public\interfaces\device.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
101 <include name="IDR_BLUETOOTH_UUID_MOJO_JS" file="${root_gen_dir}\device\bl uetooth\public\interfaces\uuid.mojom.js" use_base_dir="false" type="BINDATA" com press="gzip" /> 101 <include name="IDR_BLUETOOTH_UUID_MOJO_JS" file="${root_gen_dir}\device\bl uetooth\public\interfaces\uuid.mojom.js" use_base_dir="false" type="BINDATA" com press="gzip" />
102 <include name="IDR_BLUETOOTH_INTERNALS_CSS" file="resources\bluetooth_inte rnals\bluetooth_internals.css" type="BINDATA" compress="gzip" /> 102 <include name="IDR_BLUETOOTH_INTERNALS_CSS" file="resources\bluetooth_inte rnals\bluetooth_internals.css" type="BINDATA" compress="gzip" />
103 <include name="IDR_BLUETOOTH_INTERNALS_ADAPTER_BROKER_JS" file="resources\ bluetooth_internals\adapter_broker.js" type="BINDATA" compress="gzip" /> 103 <include name="IDR_BLUETOOTH_INTERNALS_ADAPTER_BROKER_JS" file="resources\ bluetooth_internals\adapter_broker.js" type="BINDATA" compress="gzip" />
104 <include name="IDR_BLUETOOTH_INTERNALS_ADAPTER_PAGE_JS" file="resources\bl uetooth_internals\adapter_page.js" type="BINDATA" compress="gzip" />
104 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS" file="resourc es\bluetooth_internals\device_collection.js" type="BINDATA" compress="gzip" /> 105 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_COLLECTION_JS" file="resourc es\bluetooth_internals\device_collection.js" type="BINDATA" compress="gzip" />
105 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS" file="resources\bl uetooth_internals\device_table.js" type="BINDATA" compress="gzip" /> 106 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS" file="resources\bl uetooth_internals\device_table.js" type="BINDATA" compress="gzip" />
106 <include name="IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS" file="resources\bl uetooth_internals\devices_page.js" type="BINDATA" compress="gzip" /> 107 <include name="IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS" file="resources\bl uetooth_internals\devices_page.js" type="BINDATA" compress="gzip" />
107 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" /> 108 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" />
108 <include name="IDR_BLUETOOTH_INTERNALS_INTERFACES_JS" file="resources\blue tooth_internals\interfaces.js" type="BINDATA" compress="gzip" /> 109 <include name="IDR_BLUETOOTH_INTERNALS_INTERFACES_JS" file="resources\blue tooth_internals\interfaces.js" type="BINDATA" compress="gzip" />
109 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" /> 110 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" />
111 <include name="IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS" file="resources \bluetooth_internals\object_fieldset.js" type="BINDATA" compress="gzip" />
110 <include name="IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS" file="resources\bluetoo th_internals\sidebar.js" type="BINDATA" compress="gzip" /> 112 <include name="IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS" file="resources\bluetoo th_internals\sidebar.js" type="BINDATA" compress="gzip" />
111 <include name="IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS" file="resources\blueto oth_internals\snackbar.js" type="BINDATA" compress="gzip" /> 113 <include name="IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS" file="resources\blueto oth_internals\snackbar.js" type="BINDATA" compress="gzip" />
112 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 114 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
113 <if expr="is_posix and not is_macosx and not is_ios"> 115 <if expr="is_posix and not is_macosx and not is_ios">
114 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 116 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
115 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 117 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
116 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 118 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
117 </if> 119 </if>
118 <if expr="enable_app_list"> 120 <if expr="enable_app_list">
119 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 121 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 <include name="IDR_CHROME_CONTENT_PLUGIN_MANIFEST_OVERLAY" file="chrome_co ntent_plugin_manifest_overlay.json" type="BINDATA" /> 624 <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" /> 625 <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" /> 626 <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" /> 627 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" />
626 <if expr="is_win"> 628 <if expr="is_win">
627 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" /> 629 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" />
628 </if> 630 </if>
629 </includes> 631 </includes>
630 </release> 632 </release>
631 </grit> 633 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/bluetooth_internals/adapter_broker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698