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

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

Issue 992173002: Delete the old hotwording integration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-remove-disable-option
Patch Set: Rebase. Created 5 years, 9 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/extensions/api/hotword_private/hotword_private_api.cc » ('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"> 2 <grit latest_public_release="0" current_release="1">
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>
11 <if expr="not is_win and not is_macosx and not is_ios"> 11 <if expr="not is_win and not is_macosx and not is_ios">
12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" /> 12 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_lin ux.html" flattenhtml="true" type="chrome_html" />
13 </if> 13 </if>
14 <if expr="is_macosx or is_ios"> 14 <if expr="is_macosx or is_ios">
15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" /> 15 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac .html" flattenhtml="true" type="chrome_html" />
16 </if> 16 </if>
17 <if expr="is_win"> 17 <if expr="is_win">
18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" /> 18 <structure name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.htm l" flattenhtml="true" type="chrome_html" />
19 </if> 19 </if>
20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" /> 20 <structure name="IDR_ABOUT_MEMORY_CSS" file="resources\about_memory.css" t ype="chrome_html" />
21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 21 <structure name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.htm l" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
22 <if expr="enable_app_list"> 22 <if expr="enable_app_list">
23 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" /> 23 <structure name="IDR_APP_LIST_START_PAGE_CSS" file="resources\app_list\s tart_page.css" flattenhtml="true" type="chrome_html" />
24 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" /> 24 <structure name="IDR_APP_LIST_START_PAGE_HTML" file="resources\app_list\ start_page.html" flattenhtml="true" type="chrome_html" />
25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" /> 25 <structure name="IDR_APP_LIST_START_PAGE_JS" file="resources\app_list\st art_page.js" flattenhtml="true" type="chrome_html" />
26 <structure name="IDR_APP_LIST_HOTWORD_NACL_NMF" file="resources\app_list \hotword_nacl.nmf" flattenhtml="true" type="chrome_html" />
27 </if> 26 </if>
28 <if expr="is_android"> 27 <if expr="is_android">
29 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex tual_search\promo.css" flattenhtml="true" type="chrome_html" /> 28 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_CSS" file="resources\contex tual_search\promo.css" flattenhtml="true" type="chrome_html" />
30 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte xtual_search\promo.html" flattenhtml="true" type="chrome_html" /> 29 <structure name="IDR_CONTEXTUAL_SEARCH_PROMO_HTML" file="resources\conte xtual_search\promo.html" flattenhtml="true" type="chrome_html" />
31 </if> 30 </if>
32 <if expr="not is_android"> 31 <if expr="not is_android">
33 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" /> 32 <structure name="IDR_DOWNLOADS_CSS" file="resources\downloads\downloads. css" flattenhtml="true" type="chrome_html" />
34 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" /> 33 <structure name="IDR_DOWNLOADS_HTML" file="resources\downloads\downloads .html" flattenhtml="true" allowexternalscript="true" type="chrome_html" />
35 </if> 34 </if>
36 <if expr="enable_extensions"> 35 <if expr="enable_extensions">
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" /> 141 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" />
143 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 142 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
144 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 143 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
145 <if expr="is_android"> 144 <if expr="is_android">
146 <include name="IDR_GET_SALIENT_IMAGE_URL_JS" file="resources\get_salient _image_url.js" type="BINDATA" /> 145 <include name="IDR_GET_SALIENT_IMAGE_URL_JS" file="resources\get_salient _image_url.js" type="BINDATA" />
147 </if> 146 </if>
148 <if expr="_google_chrome or enable_hangout_services_extension"> 147 <if expr="_google_chrome or enable_hangout_services_extension">
149 <!-- Hangout Services extension, included in Google Chrome builds only. --> 148 <!-- Hangout Services extension, included in Google Chrome builds only. -->
150 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 149 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
151 </if> 150 </if>
152 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper \manifest.json" type="BINDATA" />
153 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.json " type="BINDATA" /> 151 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.json " type="BINDATA" />
154 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho tword_audio_verification\manifest.json" type="BINDATA" /> 152 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ho tword_audio_verification\manifest.json" type="BINDATA" />
155 <if expr="not is_android"> 153 <if expr="not is_android">
156 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 154 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
157 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" /> 155 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" />
158 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" /> 156 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" />
159 </if> 157 </if>
160 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 158 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
161 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 159 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
162 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 160 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 <include name="IDR_DOWN_ARROW_SHOWING_ICON" file="resources\media_router \elements\icon\down-arrow-showing.png" type="BINDATA" /> 456 <include name="IDR_DOWN_ARROW_SHOWING_ICON" file="resources\media_router \elements\icon\down-arrow-showing.png" type="BINDATA" />
459 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_ICON" file="resources\med ia_router\elements\icon\generic-device.png" type="BINDATA" /> 457 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_ICON" file="resources\med ia_router\elements\icon\generic-device.png" type="BINDATA" />
460 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_2X_ICON" file="resources\ media_router\elements\icon\generic-device2x.png" type="BINDATA" /> 458 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_2X_ICON" file="resources\ media_router\elements\icon\generic-device2x.png" type="BINDATA" />
461 <include name="IDR_MEDIA_ROUTER_HANGOUTS_ICON" file="resources\media_rou ter\elements\icon\hangouts-icon.png" type="BINDATA" /> 459 <include name="IDR_MEDIA_ROUTER_HANGOUTS_ICON" file="resources\media_rou ter\elements\icon\hangouts-icon.png" type="BINDATA" />
462 <include name="IDR_MEDIA_ROUTER_HANGOUTS_2X_ICON" file="resources\media_ router\elements\icon\hangouts-icon2x.png" type="BINDATA" /> 460 <include name="IDR_MEDIA_ROUTER_HANGOUTS_2X_ICON" file="resources\media_ router\elements\icon\hangouts-icon2x.png" type="BINDATA" />
463 <include name="IDR_SAD_FACE_ICON" file="resources\media_router\elements\ icon\sad-face.png" type="BINDATA" /> 461 <include name="IDR_SAD_FACE_ICON" file="resources\media_router\elements\ icon\sad-face.png" type="BINDATA" />
464 </if> 462 </if>
465 </includes> 463 </includes>
466 </release> 464 </release>
467 </grit> 465 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/hotword_private/hotword_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698