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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/chromecast_build.gni") 6 import("//build/config/chromecast_build.gni")
7 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 9
10 # Please keep features in alphabetical order. 10 # Please keep features in alphabetical order.
(...skipping 11 matching lines...) Expand all
22 # and have a system dialog. 22 # and have a system dialog.
23 enable_basic_print_dialog = enable_basic_printing && !is_chromeos 23 enable_basic_print_dialog = enable_basic_printing && !is_chromeos
24 24
25 enable_captive_portal_detection = !is_android && !is_ios && !is_chromecast 25 enable_captive_portal_detection = !is_android && !is_ios && !is_chromecast
26 26
27 # Google Now is disabled to prepare for its removal. 27 # Google Now is disabled to prepare for its removal.
28 # http://crbug.com/539674 28 # http://crbug.com/539674
29 enable_google_now = false 29 enable_google_now = false
30 30
31 # Hangout services is an extension that adds extra features to Hangouts. 31 # Hangout services is an extension that adds extra features to Hangouts.
32 # For official Chrome builds, this flag is set on the bots. 32 # It is enableable separately to facilitate testing.
33 enable_hangout_services_extension = false 33 enable_hangout_services_extension = is_chrome_branded
34 34
35 # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This 35 # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
36 # will download a closed-source NaCl module at startup.) Chrome-branded 36 # will download a closed-source NaCl module at startup.) Chrome-branded
37 # ChromeOS builds have this enabled by default. 37 # ChromeOS builds have this enabled by default.
38 enable_hotwording = is_chrome_branded && is_chromeos 38 enable_hotwording = is_chrome_branded && is_chromeos
39 39
40 enable_one_click_signin = 40 enable_one_click_signin =
41 is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) 41 is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
42 42
43 # Set to true to bundle all the mash related mojo services into chrome. 43 # Set to true to bundle all the mash related mojo services into chrome.
(...skipping 17 matching lines...) Expand all
61 pgo_build = chrome_pgo_phase > 0 61 pgo_build = chrome_pgo_phase > 0
62 62
63 # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://) 63 # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://)
64 # pages. https://github.com/polymer/vulcanize 64 # pages. https://github.com/polymer/vulcanize
65 use_vulcanize = true 65 use_vulcanize = true
66 } 66 }
67 67
68 chrome_grit_defines = [ 68 chrome_grit_defines = [
69 "enable_background=$enable_background", 69 "enable_background=$enable_background",
70 "enable_google_now=$enable_google_now", 70 "enable_google_now=$enable_google_now",
71 "enable_hangout_services_extension=$enable_hangout_services_extension",
71 "enable_hotwording=$enable_hotwording", 72 "enable_hotwording=$enable_hotwording",
72 "enable_service_discovery=$enable_service_discovery", 73 "enable_service_discovery=$enable_service_discovery",
73 "enable_vr_shell=$enable_vr_shell", 74 "enable_vr_shell=$enable_vr_shell",
74 "enable_webvr=$enable_webvr", 75 "enable_webvr=$enable_webvr",
75 "safe_browsing_mode=$safe_browsing_mode", 76 "safe_browsing_mode=$safe_browsing_mode",
76 "use_vulcanize=$use_vulcanize", 77 "use_vulcanize=$use_vulcanize",
77 ] 78 ]
OLDNEW
« 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