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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browser_resources.grd
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index aa6e258ec2d98bb87543054d97d1081e2df78470..76a910ed9b6c8d6e46b5fcea7d9b8253ccaa38d3 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -143,7 +143,7 @@
<include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.json" type="BINDATA" />
<include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
- <if expr="pp_ifdef('_google_chrome')">
+ <if expr="pp_ifdef('_google_chrome') or pp_ifdef('enable_hangout_services_extension')">
<!-- Hangout Services extension, included in Google Chrome builds only. -->
<include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_services\manifest.json" type="BINDATA" />
</if>
« 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