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

Unified Diff: build/common.gypi

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 7 years, 11 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: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0a241b5b028e61934470358ffa738b11d1419ea2..21412d49b5ed7f5f639c134550f87c2aecfebbd9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -410,6 +410,9 @@
'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x86',
'wix_path%': '<(DEPTH)/third_party/wix',
+ # Managed users are enabled by default.
+ 'enable_managed_users%': 1,
+
'conditions': [
# TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
# the 'conditions' clause. Initial attempts resulted in chromium and
@@ -518,6 +521,7 @@
'notifications%': 0,
'remoting%': 0,
'safe_browsing%': 0,
+ 'enable_managed_users%': 0,
}],
# Use GPU accelerated cross process image transport by default
@@ -740,6 +744,7 @@
'google_api_key%': '<(google_api_key)',
'google_default_client_id%': '<(google_default_client_id)',
'google_default_client_secret%': '<(google_default_client_secret)',
+ 'enable_managed_users%': '<(enable_managed_users)',
# Use system mesa instead of bundled one.
'use_system_mesa%': 0,
@@ -1194,6 +1199,8 @@
'use_system_icu%': '<(android_build_type)',
'use_system_stlport%': '<(android_build_type)',
+ 'enable_managed_users%': 0,
+
# Copy it out one scope.
'android_build_type%': '<(android_build_type)',
}], # OS=="android"
@@ -1962,6 +1969,9 @@
['disable_ftp_support==1', {
'defines': ['DISABLE_FTP_SUPPORT=1'],
}],
+ ['enable_managed_users==1', {
+ 'defines': ['ENABLE_MANAGED_USERS=1'],
+ }],
], # conditions for 'target_defaults'
'target_conditions': [
['enable_wexit_time_destructors==1', {

Powered by Google App Engine
This is Rietveld 408576698