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

Unified Diff: chrome/chrome_browser.gypi

Issue 6312121: Add initial device policy infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix race condition and tests. Created 9 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
« no previous file with comments | « chrome/browser/prefs/pref_value_store_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cb0fe5603fd442fdfa43e2fc7ae46a2007e680d1..54a08e2e75e8904cad98c7a3fef495960f2c07d5 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1747,6 +1747,15 @@
'browser/policy/asynchronous_policy_loader.h',
'browser/policy/asynchronous_policy_provider.cc',
'browser/policy/asynchronous_policy_provider.h',
+ 'browser/policy/browser_policy_context.cc',
+ 'browser/policy/browser_policy_context.h',
+ 'browser/policy/cloud_policy_cache.cc',
+ 'browser/policy/cloud_policy_cache.h',
+ 'browser/policy/cloud_policy_client.cc',
+ 'browser/policy/cloud_policy_client.h',
+ 'browser/policy/cloud_policy_context.cc',
+ 'browser/policy/cloud_policy_context.h',
+ 'browser/policy/cloud_policy_controller.h',
'browser/policy/config_dir_policy_provider.cc',
'browser/policy/config_dir_policy_provider.h',
'browser/policy/configuration_policy_loader_win.cc',
@@ -1757,8 +1766,6 @@
'browser/policy/configuration_policy_provider.h',
'browser/policy/configuration_policy_provider_delegate_win.cc',
'browser/policy/configuration_policy_provider_delegate_win.h',
- 'browser/policy/configuration_policy_provider_keeper.cc',
- 'browser/policy/configuration_policy_provider_keeper.h',
'browser/policy/configuration_policy_provider_mac.cc',
'browser/policy/configuration_policy_provider_mac.h',
'browser/policy/configuration_policy_provider_win.cc',
@@ -1767,12 +1774,10 @@
'browser/policy/device_management_backend.h',
'browser/policy/device_management_backend_impl.cc',
'browser/policy/device_management_backend_impl.h',
- 'browser/policy/device_management_policy_cache.cc',
- 'browser/policy/device_management_policy_cache.h',
- 'browser/policy/device_management_policy_provider.cc',
- 'browser/policy/device_management_policy_provider.h',
'browser/policy/device_management_service.cc',
'browser/policy/device_management_service.h',
+ 'browser/policy/device_policy_controller.cc',
+ 'browser/policy/device_policy_controller.h',
'browser/policy/device_token_fetcher.cc',
'browser/policy/device_token_fetcher.h',
'browser/policy/dummy_configuration_policy_provider.cc',
@@ -1785,6 +1790,8 @@
'browser/policy/managed_prefs_banner_base.h',
'browser/policy/profile_policy_context.cc',
'browser/policy/profile_policy_context.h',
+ 'browser/policy/user_policy_controller.cc',
+ 'browser/policy/user_policy_controller.h',
# TODO(danno): Find a better way to include these files
'<(protoc_out_dir)/chrome/browser/policy/proto/cloud_policy.pb.cc',
'<(protoc_out_dir)/chrome/browser/policy/proto/cloud_policy.pb.h',
@@ -3594,6 +3601,8 @@
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
['exclude', 'browser/oom_priority_manager.cc'],
['exclude', 'browser/oom_priority_manager.h'],
+ ['exclude', 'browser/policy/device_policy_controller.cc'],
+ ['exclude', 'browser/policy/device_policy_controller.h'],
['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
['exclude', 'browser/renderer_host/offline_resource_handler.h'],
],
« no previous file with comments | « chrome/browser/prefs/pref_value_store_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698