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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 464213002: Add a 'NaCl manager' to manage the state of the NaCl hotword detector plugin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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/hotword/constants.js » ('j') | chrome/browser/resources/hotword/constants.js » ('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 <!-- 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 <if expr="_google_chrome or enable_hangout_services_extension"> 57 <if expr="_google_chrome or enable_hangout_services_extension">
58 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" /> 58 <include name="IDR_HANGOUT_SERVICES_BACKGROUND_HTML" file="hangout_servi ces/background.html" type="BINDATA" />
59 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" /> 59 <include name="IDR_HANGOUT_SERVICES_THUNK_JS" file="hangout_services/thu nk.js" type="BINDATA" />
60 </if> 60 </if>
61 <if expr="enable_extensions"> 61 <if expr="enable_extensions">
62 <!-- Hotword Helper extension --> 62 <!-- Hotword Helper extension -->
63 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/ audio_client.js" type="BINDATA" /> 63 <include name="IDR_HOTWORD_HELPER_AUDIO_CLIENT_JS" file="hotword_helper/ audio_client.js" type="BINDATA" />
64 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manag er.js" type="BINDATA" /> 64 <include name="IDR_HOTWORD_HELPER_MANAGER_JS" file="hotword_helper/manag er.js" type="BINDATA" />
65 65
66 <!-- (Experimental) hotword triggering extension --> 66 <!-- (Experimental) hotword triggering extension -->
67 <include name="IDR_HOTWORD_CONSTANTS_JS" file="hotword/constants.js" typ e="BINDATA" />
67 <include name="IDR_HOTWORD_MANAGER_JS" file="hotword/manager.js" type="B INDATA" /> 68 <include name="IDR_HOTWORD_MANAGER_JS" file="hotword/manager.js" type="B INDATA" />
69 <include name="IDR_HOTWORD_NACL_MANAGER_JS" file="hotword/nacl_manager.j s" type="BINDATA" />
68 </if> 70 </if>
69 <if expr="not is_android"> 71 <if expr="not is_android">
70 <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 72 <include name="IDR_FEEDBACK_DEFAULT_HTML" file="feedback/html/default.ht ml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
71 <include name="IDR_FEEDBACK_EVENT_HANDLER_JS" file="feedback/js/event_ha ndler.js" flattenhtml="true" type="BINDATA" /> 73 <include name="IDR_FEEDBACK_EVENT_HANDLER_JS" file="feedback/js/event_ha ndler.js" flattenhtml="true" type="BINDATA" />
72 <include name="IDR_FEEDBACK_FEEDBACK_JS" file="feedback/js/feedback.js" flattenhtml="true" type="BINDATA" /> 74 <include name="IDR_FEEDBACK_FEEDBACK_JS" file="feedback/js/feedback.js" flattenhtml="true" type="BINDATA" />
73 <include name="IDR_FEEDBACK_TAKE_SCREENSHOT_JS" file="feedback/js/take_s creenshot.js" flattenhtml="true" type="BINDATA" /> 75 <include name="IDR_FEEDBACK_TAKE_SCREENSHOT_JS" file="feedback/js/take_s creenshot.js" flattenhtml="true" type="BINDATA" />
74 <include name="IDR_FEEDBACK_TOPBAR_HANDLER_JS" file="feedback/js/topbar_ handlers.js" flattenhtml="true" type="BINDATA" /> 76 <include name="IDR_FEEDBACK_TOPBAR_HANDLER_JS" file="feedback/js/topbar_ handlers.js" flattenhtml="true" type="BINDATA" />
75 <include name="IDR_FEEDBACK_FEEDBACK_CSS" file="feedback/css/feedback.cs s" type="BINDATA" /> 77 <include name="IDR_FEEDBACK_FEEDBACK_CSS" file="feedback/css/feedback.cs s" type="BINDATA" />
76 <include name="IDR_FEEDBACK_ICON_32" file="feedback/images/icon32.png" t ype="BINDATA" /> 78 <include name="IDR_FEEDBACK_ICON_32" file="feedback/images/icon32.png" t ype="BINDATA" />
77 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" t ype="BINDATA" /> 79 <include name="IDR_FEEDBACK_ICON_64" file="feedback/images/icon64.png" t ype="BINDATA" />
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 <!-- The next two files have a .png extension since grit for some reason 194 <!-- The next two files have a .png extension since grit for some reason
193 won't compile these files in if they are named .nmf/.pexe or 195 won't compile these files in if they are named .nmf/.pexe or
194 anything remotely similar to their actual extension. Naming these 196 anything remotely similar to their actual extension. Naming these
195 .js or .html breaks all kinds of presubmit checks, hence .png seems 197 .js or .html breaks all kinds of presubmit checks, hence .png seems
196 to be the only viable option at the moment. --> 198 to be the only viable option at the moment. -->
197 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" /> 199 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_NMF" file="whis pernet_proxy/whispernet_proxy.nmf.png" type="BINDATA" />
198 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" /> 200 <include name="IDR_WHISPERNET_PROXY_WHISPERNET_PROXY_PROXY_PEXE" file="whi spernet_proxy/whispernet_proxy_pnacl.pexe.png" type="BINDATA" />
199 </includes> 201 </includes>
200 </release> 202 </release>
201 </grit> 203 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/hotword/constants.js » ('j') | chrome/browser/resources/hotword/constants.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698