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

Unified Diff: chrome/common/features.gni

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/features.gni
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
index cfd943792bc0ceb428ed7082cc5f6847b73e0cd4..5bf51d569eb7a37d0dc340e839a584faf6f1b10f 100644
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -29,8 +29,8 @@ declare_args() {
enable_google_now = false
# Hangout services is an extension that adds extra features to Hangouts.
- # For official Chrome builds, this flag is set on the bots.
- enable_hangout_services_extension = false
+ # It is enableable separately to facilitate testing.
+ enable_hangout_services_extension = is_chrome_branded
# 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
# will download a closed-source NaCl module at startup.) Chrome-branded
@@ -68,6 +68,7 @@ declare_args() {
chrome_grit_defines = [
"enable_background=$enable_background",
"enable_google_now=$enable_google_now",
+ "enable_hangout_services_extension=$enable_hangout_services_extension",
"enable_hotwording=$enable_hotwording",
"enable_service_discovery=$enable_service_discovery",
"enable_vr_shell=$enable_vr_shell",
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698