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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/component_extension_resources.grd

Issue 799923007: Enable 3rd party support for Security Keys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove duplicate line from merge Created 6 years 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/cryptotoken/cryptotokenapprovedorigins.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 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. --> 3 without changes to the corresponding grd file. -->
4 <grit latest_public_release="0" current_release="1"> 4 <grit latest_public_release="0" current_release="1">
5 <outputs> 5 <outputs>
6 <output filename="grit/component_extension_resources.h" type="rc_header"> 6 <output filename="grit/component_extension_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" /> 9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />
10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" /> 10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 <include name="IDR_CRYPTOTOKEN_USBHELPER_JS" file="cryptotoken/usbhelper.j s" type="BINDATA" /> 205 <include name="IDR_CRYPTOTOKEN_USBHELPER_JS" file="cryptotoken/usbhelper.j s" type="BINDATA" />
206 <include name="IDR_CRYPTOTOKEN_TEXTFETCHER_JS" file="cryptotoken/textfetch er.js" type="BINDATA" /> 206 <include name="IDR_CRYPTOTOKEN_TEXTFETCHER_JS" file="cryptotoken/textfetch er.js" type="BINDATA" />
207 <include name="IDR_CRYPTOTOKEN_REQUESTHELPER_JS" file="cryptotoken/request helper.js" type="BINDATA" /> 207 <include name="IDR_CRYPTOTOKEN_REQUESTHELPER_JS" file="cryptotoken/request helper.js" type="BINDATA" />
208 <include name="IDR_CRYPTOTOKEN_MESSAGETYPES_JS" file="cryptotoken/messaget ypes.js" type="BINDATA" /> 208 <include name="IDR_CRYPTOTOKEN_MESSAGETYPES_JS" file="cryptotoken/messaget ypes.js" type="BINDATA" />
209 <include name="IDR_CRYPTOTOKEN_INHERITS_JS" file="cryptotoken/inherits.js" type="BINDATA" /> 209 <include name="IDR_CRYPTOTOKEN_INHERITS_JS" file="cryptotoken/inherits.js" type="BINDATA" />
210 <include name="IDR_CRYPTOTOKEN_GNUBBYDEVICE_JS" file="cryptotoken/gnubbyde vice.js" type="BINDATA" /> 210 <include name="IDR_CRYPTOTOKEN_GNUBBYDEVICE_JS" file="cryptotoken/gnubbyde vice.js" type="BINDATA" />
211 <include name="IDR_CRYPTOTOKEN_GENERICHELPER_JS" file="cryptotoken/generic helper.js" type="BINDATA" /> 211 <include name="IDR_CRYPTOTOKEN_GENERICHELPER_JS" file="cryptotoken/generic helper.js" type="BINDATA" />
212 <include name="IDR_CRYPTOTOKEN_FACTORYREGISTRY_JS" file="cryptotoken/facto ryregistry.js" type="BINDATA" /> 212 <include name="IDR_CRYPTOTOKEN_FACTORYREGISTRY_JS" file="cryptotoken/facto ryregistry.js" type="BINDATA" />
213 <include name="IDR_CRYPTOTOKEN_ERRORCODES_JS" file="cryptotoken/errorcodes .js" type="BINDATA" /> 213 <include name="IDR_CRYPTOTOKEN_ERRORCODES_JS" file="cryptotoken/errorcodes .js" type="BINDATA" />
214 <include name="IDR_CRYPTOTOKEN_DEVICEFACTORYREGISTRY_JS" file="cryptotoken /devicefactoryregistry.js" type="BINDATA" /> 214 <include name="IDR_CRYPTOTOKEN_DEVICEFACTORYREGISTRY_JS" file="cryptotoken /devicefactoryregistry.js" type="BINDATA" />
215 <include name="IDR_CRYPTOTOKEN_GSTATICORIGINCHECK_JS" file="cryptotoken/gs taticorigincheck.js" type="BINDATA" />
216 <include name="IDR_CRYPTOTOKEN_ORIGINCHECK_JS" file="cryptotoken/originche ck.js" type="BINDATA" /> 215 <include name="IDR_CRYPTOTOKEN_ORIGINCHECK_JS" file="cryptotoken/originche ck.js" type="BINDATA" />
217 <include name="IDR_CRYPTOTOKEN_INDIVIDUALATTEST_JS" file="cryptotoken/indi vidualattest.js" type="BINDATA" /> 216 <include name="IDR_CRYPTOTOKEN_INDIVIDUALATTEST_JS" file="cryptotoken/indi vidualattest.js" type="BINDATA" />
218 <include name="IDR_CRYPTOTOKEN_GOOGLECORPINDIVIDUALATTEST_JS" file="crypto token/googlecorpindividualattest.js" type="BINDATA" /> 217 <include name="IDR_CRYPTOTOKEN_GOOGLECORPINDIVIDUALATTEST_JS" file="crypto token/googlecorpindividualattest.js" type="BINDATA" />
219 <include name="IDR_CRYPTOTOKEN_APPROVEDORIGINS_JS" file="cryptotoken/appro vedorigins.js" type="BINDATA" /> 218 <include name="IDR_CRYPTOTOKEN_APPROVEDORIGINS_JS" file="cryptotoken/appro vedorigins.js" type="BINDATA" />
220 <include name="IDR_CRYPTOTOKEN_GOOGLEAPPROVEDORIGINS_JS" file="cryptotoken /googleapprovedorigins.js" type="BINDATA" />
221 <include name="IDR_CRYPTOTOKEN_WEBREQUESTSENDER_JS" file="cryptotoken/webr equestsender.js" type="BINDATA" /> 219 <include name="IDR_CRYPTOTOKEN_WEBREQUESTSENDER_JS" file="cryptotoken/webr equestsender.js" type="BINDATA" />
222 <include name="IDR_CRYPTOTOKEN_WATCHDOG_JS" file="cryptotoken/watchdog.js" type="BINDATA" /> 220 <include name="IDR_CRYPTOTOKEN_WATCHDOG_JS" file="cryptotoken/watchdog.js" type="BINDATA" />
221 <include name="IDR_CRYPTOTOKEN_CRYPTOTOKENAPPROVEDORIGIN_JS" file="cryptot oken/cryptotokenapprovedorigins.js" type="BINDATA" />
222 <include name="IDR_CRYPTOTOKEN_ETLD_JS" file="cryptotoken/etld.js" type="B INDATA" />
223 <include name="IDR_CRYPTOTOKEN_ETLD_NAMES_LIST_JS" file="cryptotoken/etld_ names_list.js" type="BINDATA" />
224 <include name="IDR_CRYPTOTOKEN_ETLDORIGINCHECK_JS" file="cryptotoken/etldo rigincheck.js" type="BINDATA" />
223 <include name="IDR_CRYPTOTOKEN_CRYPTOTOKENBACKGROUND_JS" file="cryptotoken /cryptotokenbackground.js" type="BINDATA" /> 225 <include name="IDR_CRYPTOTOKEN_CRYPTOTOKENBACKGROUND_JS" file="cryptotoken /cryptotokenbackground.js" type="BINDATA" />
224 <include name="IDR_WHISPERNET_PROXY_BACKGROUND_HTML" file="whispernet_prox y/background.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 226 <include name="IDR_WHISPERNET_PROXY_BACKGROUND_HTML" file="whispernet_prox y/background.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
225 <include name="IDR_WHISPERNET_PROXY_INIT_JS" file="whispernet_proxy/js/ini t.js" type="BINDATA" /> 227 <include name="IDR_WHISPERNET_PROXY_INIT_JS" file="whispernet_proxy/js/ini t.js" type="BINDATA" />
226 <include name="IDR_WHISPERNET_PROXY_NACL_JS" file="whispernet_proxy/js/nac l.js" type="BINDATA" /> 228 <include name="IDR_WHISPERNET_PROXY_NACL_JS" file="whispernet_proxy/js/nac l.js" type="BINDATA" />
227 <include name="IDR_WHISPERNET_PROXY_WRAPPER_JS" file="whispernet_proxy/js/ wrapper.js" type="BINDATA" /> 229 <include name="IDR_WHISPERNET_PROXY_WRAPPER_JS" file="whispernet_proxy/js/ wrapper.js" type="BINDATA" />
228 <!-- The next two files have a .png extension since grit for some reason 230 <!-- The next two files have a .png extension since grit for some reason
229 won't compile these files in if they are named .nmf/.pexe or 231 won't compile these files in if they are named .nmf/.pexe or
230 anything remotely similar to their actual extension. Naming these 232 anything remotely similar to their actual extension. Naming these
231 .js or .html breaks all kinds of presubmit checks, hence .png seems 233 .js or .html breaks all kinds of presubmit checks, hence .png seems
232 to be the only viable option at the moment. --> 234 to be the only viable option at the moment. -->
233 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 235 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
234 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 236 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
235 </includes> 237 </includes>
236 </release> 238 </release>
237 </grit> 239 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/cryptotoken/cryptotokenapprovedorigins.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698