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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2448713002: bluetooth: Add Device connection logic and accompanying user interface. (Closed)
Patch Set: Created 4 years, 1 month 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.html » ('j') | device/bluetooth/adapter.cc » ('J')
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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 86 <include name="IDR_ABOUT_NACL_HTML" file="resources\about_nacl.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
87 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" /> 87 <include name="IDR_ABOUT_NACL_CSS" file="resources\about_nacl.css" flatt enhtml="true" type="chrome_html" />
88 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" /> 88 <include name="IDR_ABOUT_NACL_JS" file="resources\about_nacl.js" type="B INDATA" />
89 </if> 89 </if>
90 <if expr="not is_android"> 90 <if expr="not is_android">
91 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" /> 91 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys\about_sys.h tml" flattenhtml="true" type="BINDATA" />
92 </if> 92 </if>
93 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" /> 93 <include name="IDR_AD_NETWORK_HASHES" file="resources\ad_networks.dat" typ e="BINDATA" />
94 <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" /> 94 <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" />
95 <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" /> 95 <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" />
96 <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" />
96 <include name="IDR_BLUETOOTH_INTERNALS_CSS" file="resources\bluetooth_inte rnals\bluetooth_internals.css" type="BINDATA" compress="gzip" /> 97 <include name="IDR_BLUETOOTH_INTERNALS_CSS" file="resources\bluetooth_inte rnals\bluetooth_internals.css" type="BINDATA" compress="gzip" />
97 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" /> 98 <include name="IDR_BLUETOOTH_INTERNALS_HTML" file="resources\bluetooth_int ernals\bluetooth_internals.html" flattenhtml="true" allowexternalscript="true" t ype="BINDATA" compress="gzip" />
98 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_JS" file="resources\bluetoot h_internals\device.js" type="BINDATA" compress="gzip" /> 99 <include name="IDR_BLUETOOTH_INTERNALS_DEVICE_JS" file="resources\bluetoot h_internals\device.js" type="BINDATA" compress="gzip" />
99 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" /> 100 <include name="IDR_BLUETOOTH_INTERNALS_JS" file="resources\bluetooth_inter nals\bluetooth_internals.js" type="BINDATA" compress="gzip" />
100 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 101 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
101 <if expr="is_posix and not is_macosx and not is_ios"> 102 <if expr="is_posix and not is_macosx and not is_ios">
102 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" /> 103 <include name="IDR_CERTIFICATE_VIEWER_HTML" file="resources\certificate_ viewer.html" type="BINDATA" />
103 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" /> 104 <include name="IDR_CERTIFICATE_VIEWER_JS" file="resources\certificate_vi ewer.js" type="BINDATA" />
104 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" /> 105 <include name="IDR_CERTIFICATE_VIEWER_CSS" file="resources\certificate_v iewer.css" type="BINDATA" />
105 </if> 106 </if>
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 596 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
596 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 597 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
597 </if> 598 </if>
598 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" /> 599 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" />
599 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" /> 600 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />
600 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" /> 601 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />
601 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" /> 602 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />
602 </includes> 603 </includes>
603 </release> 604 </release>
604 </grit> 605 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/bluetooth_internals/bluetooth_internals.html » ('j') | device/bluetooth/adapter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698