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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2627243002: bluetooth: Add control for reading/writing of characteristics to internals page. (Closed)
Patch Set: Merge upstream, add comment detail for type converter 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 | « no previous file | chrome/browser/resources/bluetooth_internals/bluetooth_internals.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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS" file="resources\bl uetooth_internals\device_table.js" type="BINDATA" compress="gzip" /> 107 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_TABLE_JS" file="resources\bl uetooth_internals\device_table.js" type="BINDATA" compress="gzip" />
108 <include name="IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS" file="resources\bl uetooth_internals\devices_page.js" type="BINDATA" compress="gzip" /> 108 <include name="IDR_BLUETOOTH_INTERNALS_DEVICES_PAGE_JS" file="resources\bl uetooth_internals\devices_page.js" type="BINDATA" compress="gzip" />
109 <include name="IDR_BLUETOOTH_INTERNALS_EXPANDABLE_LIST_JS" file="resources \bluetooth_internals\expandable_list.js" type="BINDATA" compress="gzip" /> 109 <include name="IDR_BLUETOOTH_INTERNALS_EXPANDABLE_LIST_JS" file="resources \bluetooth_internals\expandable_list.js" type="BINDATA" compress="gzip" />
110 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" /> 110 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" />
111 <include name="IDR_BLUETOOTH_INTERNALS_INTERFACES_JS" file="resources\blue tooth_internals\interfaces.js" type="BINDATA" compress="gzip" /> 111 <include name="IDR_BLUETOOTH_INTERNALS_INTERFACES_JS" file="resources\blue tooth_internals\interfaces.js" type="BINDATA" compress="gzip" />
112 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" /> 112 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" />
113 <include name="IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS" file="resources \bluetooth_internals\object_fieldset.js" type="BINDATA" compress="gzip" /> 113 <include name="IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS" file="resources \bluetooth_internals\object_fieldset.js" type="BINDATA" compress="gzip" />
114 <include name="IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS" file="resources\bl uetooth_internals\service_list.js" type="BINDATA" compress="gzip" /> 114 <include name="IDR_BLUETOOTH_INTERNALS_SERVICE_LIST_JS" file="resources\bl uetooth_internals\service_list.js" type="BINDATA" compress="gzip" />
115 <include name="IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS" file="resources\bluetoo th_internals\sidebar.js" type="BINDATA" compress="gzip" /> 115 <include name="IDR_BLUETOOTH_INTERNALS_SIDEBAR_JS" file="resources\bluetoo th_internals\sidebar.js" type="BINDATA" compress="gzip" />
116 <include name="IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS" file="resources\blueto oth_internals\snackbar.js" type="BINDATA" compress="gzip" /> 116 <include name="IDR_BLUETOOTH_INTERNALS_SNACKBAR_JS" file="resources\blueto oth_internals\snackbar.js" type="BINDATA" compress="gzip" />
117 <include name="IDR_BLUETOOTH_INTERNALS_VALUE_CONTROL_JS" file="resources\b luetooth_internals\value_control.js" type="BINDATA" compress="gzip" />
117 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 118 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
118 <if expr="is_posix and not is_macosx and not is_ios"> 119 <if expr="is_posix and not is_macosx and not is_ios">
119 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 120 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
120 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 121 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
121 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 122 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
122 </if> 123 </if>
123 <if expr="enable_app_list"> 124 <if expr="enable_app_list">
124 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 125 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
125 </if> 126 </if>
126 <if expr="enable_printing"> 127 <if expr="enable_printing">
(...skipping 502 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" /> 630 <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" /> 631 <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" /> 632 <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" /> 633 <include name="IDR_NACL_LOADER_MANIFEST" file="../../components/nacl/loade r/nacl_loader_manifest.json" type="BINDATA" />
633 <if expr="is_win"> 634 <if expr="is_win">
634 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" /> 635 <include name="IDR_NACL_BROKER_MANIFEST" file="../../components/nacl/bro ker/nacl_broker_manifest.json" type="BINDATA" />
635 </if> 636 </if>
636 </includes> 637 </includes>
637 </release> 638 </release>
638 </grit> 639 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/bluetooth_internals/bluetooth_internals.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698