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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 163583004: Add GYP flag to optionally enable the Hangout Services extension in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing hack to copy to outer scope. Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | 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"> 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>
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 </if> 136 </if>
137 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 137 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
138 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" /> 138 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" />
139 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" /> 139 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" />
140 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 140 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
141 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 141 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
142 </if> 142 </if>
143 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" /> 143 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" />
144 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 144 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
145 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 145 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
146 <if expr="pp_ifdef('_google_chrome')"> 146 <if expr="pp_ifdef('_google_chrome') or pp_ifdef('enable_hangout_services_ extension')">
147 <!-- Hangout Services extension, included in Google Chrome builds only. --> 147 <!-- Hangout Services extension, included in Google Chrome builds only. -->
148 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 148 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
149 </if> 149 </if>
150 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper \manifest.json" type="BINDATA" /> 150 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper \manifest.json" type="BINDATA" />
151 <if expr="not is_android"> 151 <if expr="not is_android">
152 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 152 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
153 <include name="IDR_HELP_FOCUS_MANAGER_JS" file="resources\help\help_focu s_manager.js" flattenhtml="true" type="BINDATA" /> 153 <include name="IDR_HELP_FOCUS_MANAGER_JS" file="resources\help\help_focu s_manager.js" flattenhtml="true" type="BINDATA" />
154 <include name="IDR_HELP_BASE_PAGE_JS" file="resources\help\help_base_pag e.js" flattenhtml="true" type="BINDATA" /> 154 <include name="IDR_HELP_BASE_PAGE_JS" file="resources\help\help_base_pag e.js" flattenhtml="true" type="BINDATA" />
155 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" /> 155 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" />
156 </if> 156 </if>
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" /> 420 <include name="IDR_ABOUT_POWER_HTML" file="resources\chromeos\power.html " type="BINDATA" />
421 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" /> 421 <include name="IDR_ABOUT_POWER_JS" file="resources\chromeos\power.js" ty pe="BINDATA" />
422 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" /> 422 <include name="IDR_ABOUT_POWER_CSS" file="resources\chromeos\power.css" type="BINDATA" />
423 </if> 423 </if>
424 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" /> 424 <include name="IDR_GCM_INTERNALS_HTML" file="resources\gcm_internals.html" type="BINDATA" />
425 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" /> 425 <include name="IDR_GCM_INTERNALS_CSS" file="resources\gcm_internals.css" t ype="BINDATA" />
426 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" /> 426 <include name="IDR_GCM_INTERNALS_JS" file="resources\gcm_internals.js" typ e="BINDATA" />
427 </includes> 427 </includes>
428 </release> 428 </release>
429 </grit> 429 </grit>
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | 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