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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2412643002: Set enable_hangout_services_extension from branding. (Closed)
Patch Set: Fix Created 4 years, 2 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/webrtc_audio_private/webrtc_audio_private_browsertest.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" 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" /> 208 <include name="IDR_VR_SHELL_UI_HTML" file="resources\vr_shell\vr_shell _ui.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
209 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" type="BINDATA" /> 209 <include name="IDR_VR_SHELL_UI_CSS" file="resources\vr_shell\vr_shell_ ui.css" type="BINDATA" />
210 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" type="BINDATA" /> 210 <include name="IDR_VR_SHELL_UI_JS" file="resources\vr_shell\vr_shell_u i.js" type="BINDATA" />
211 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" type="BINDATA" /> 211 <include name="IDR_VR_SHELL_UI_API_JS" file="resources\vr_shell\vr_she ll_ui_api.js" type="BINDATA" />
212 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" type="BINDATA" /> 212 <include name="IDR_VR_SHELL_UI_SCENE_JS" file="resources\vr_shell\vr_s hell_ui_scene.js" type="BINDATA" />
213 </if> 213 </if>
214 </if> 214 </if>
215 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" /> 215 <include name="IDR_SUPERVISED_USER_INTERNALS_HTML" file="resources\supervi sed_user_internals.html" allowexternalscript="true" compress="gzip" type="BINDAT A" />
216 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" /> 216 <include name="IDR_SUPERVISED_USER_INTERNALS_CSS" file="resources\supervis ed_user_internals.css" compress="gzip" type="BINDATA" />
217 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" /> 217 <include name="IDR_SUPERVISED_USER_INTERNALS_JS" file="resources\supervise d_user_internals.js" compress="gzip" type="BINDATA" />
218 <if expr="_google_chrome or enable_hangout_services_extension"> 218 <if expr="enable_hangout_services_extension">
219 <!-- Hangout Services extension, included in Google Chrome builds only. --> 219 <!-- Hangout Services extension, included in Google Chrome builds only. -->
220 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 220 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
221 </if> 221 </if>
222 <if expr="enable_hotwording"> 222 <if expr="enable_hotwording">
223 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.js on" type="BINDATA" /> 223 <include name="IDR_HOTWORD_MANIFEST" file="resources\hotword\manifest.js on" type="BINDATA" />
224 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ hotword_audio_verification\manifest.json" type="BINDATA" /> 224 <include name="IDR_HOTWORD_AUDIO_VERIFICATION_MANIFEST" file="resources\ hotword_audio_verification\manifest.json" type="BINDATA" />
225 </if> 225 </if>
226 <if expr="not is_android"> 226 <if expr="not is_android">
227 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 227 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
228 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" /> 228 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" />
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 593 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
594 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 594 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
595 </if> 595 </if>
596 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" /> 596 <include name="IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY" file="chrome_c ontent_browser_manifest_overlay.json" type="BINDATA" />
597 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" /> 597 <include name="IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY" file="chrome_conte nt_gpu_manifest_overlay.json" type="BINDATA" />
598 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" /> 598 <include name="IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY" file="chrome_ content_renderer_manifest_overlay.json" type="BINDATA" />
599 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" /> 599 <include name="IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY" file="chrome_c ontent_utility_manifest_overlay.json" type="BINDATA" />
600 </includes> 600 </includes>
601 </release> 601 </release>
602 </grit> 602 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698