summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 18:50:05 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 18:50:05 +0000
commit3c76406851ebc2d466ac2683510ea6bad7929325 (patch)
tree262ecfe5ff0c8a3a0c2037c5fe69db42bb20ecc9 /chrome/chrome_browser.gypi
parent8f914182fcfabf9975b13e5ca78a0e97c98e0379 (diff)
downloadchromium_src-3c76406851ebc2d466ac2683510ea6bad7929325.zip
chromium_src-3c76406851ebc2d466ac2683510ea6bad7929325.tar.gz
chromium_src-3c76406851ebc2d466ac2683510ea6bad7929325.tar.bz2
Add support for loading user cloud policy on desktop, behind the --load-cloud-policy-on-signin flag.
Move UserCloudPolicyManager to be owned by the Profile as a step towards supporting multiple profiles. Added TestingProfile::Builder as a start towards taming the madness of all the different constructors and setters. BUG=141123 TEST=none Review URL: https://chromiumcodereview.appspot.com/10693022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi14
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d74c016..12cca45 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1764,12 +1764,20 @@
'browser/policy/url_blacklist_manager.h',
'browser/policy/user_cloud_policy_manager.cc',
'browser/policy/user_cloud_policy_manager.h',
+ 'browser/policy/user_cloud_policy_store.cc',
+ 'browser/policy/user_cloud_policy_store.h',
+ 'browser/policy/user_cloud_policy_store_base.cc',
+ 'browser/policy/user_cloud_policy_store_base.h',
'browser/policy/user_cloud_policy_store_chromeos.cc',
'browser/policy/user_cloud_policy_store_chromeos.h',
'browser/policy/user_policy_cache.cc',
'browser/policy/user_policy_cache.h',
'browser/policy/user_policy_disk_cache.cc',
'browser/policy/user_policy_disk_cache.h',
+ 'browser/policy/user_policy_signin_service.cc',
+ 'browser/policy/user_policy_signin_service.h',
+ 'browser/policy/user_policy_signin_service_factory.cc',
+ 'browser/policy/user_policy_signin_service_factory.h',
'browser/policy/user_policy_token_cache.cc',
'browser/policy/user_policy_token_cache.h',
'browser/predictors/autocomplete_action_predictor.cc',
@@ -4615,6 +4623,12 @@
['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
+ ['exclude', 'browser/policy/user_cloud_policy_store.cc'],
+ ['exclude', 'browser/policy/user_cloud_policy_store.h'],
+ ['exclude', 'browser/policy/user_policy_signin_service.cc'],
+ ['exclude', 'browser/policy/user_policy_signin_service.h'],
+ ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'],
+ ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
['exclude', 'browser/platform_util_linux.cc'],
['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],