diff options
| author | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
|---|---|---|
| committer | jkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-16 14:37:00 +0000 |
| commit | 1e16fd462495798e68603560a2a44de2109d14a6 (patch) | |
| tree | 80db982880e6f4e4a746e2753e64ebbe7ed9cd3e /chrome/chrome_browser.gypi | |
| parent | c574bcd52bd3ff2e8e9a8e2ff1505ee6bc328b73 (diff) | |
| download | chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.zip chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.gz chromium_src-1e16fd462495798e68603560a2a44de2109d14a6.tar.bz2 | |
Revert 75106 - New policy protobuf protocol.
(Second attempt to land http://codereview.chromium.org/6409040/)
- cloud_policy.proto autogenerated from policy_templats.json
- C++ method decoding the protobuf also autogenerated from policy_templates.json
- changed policy fetching mechanism to fetch new-style policy protobufs
BUG=68309, chromium-os:11253, chromium-os:11255
TEST=CloudPolicyCacheTest.*; also manual test against python testserver
Review URL: http://codereview.chromium.org/6523058
TBR=jkummerow@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 85e4c01..7e853d6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -9,7 +9,7 @@ 'type': '<(library)', 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 'dependencies': [ - 'app/policy/cloud_policy_codegen.gyp:policy', + 'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome_extra_resources', 'chrome_resources', @@ -19,6 +19,7 @@ 'debugger', 'installer_util', 'platform_locale_settings', + 'policy', 'profile_import', 'safe_browsing_csd_proto', 'safe_browsing_report_proto', @@ -1762,8 +1763,6 @@ 'browser/policy/asynchronous_policy_loader.h', 'browser/policy/asynchronous_policy_provider.cc', 'browser/policy/asynchronous_policy_provider.h', - 'browser/policy/cloud_policy_cache.cc', - 'browser/policy/cloud_policy_cache.h', 'browser/policy/config_dir_policy_provider.cc', 'browser/policy/config_dir_policy_provider.h', 'browser/policy/configuration_policy_loader_win.cc', @@ -1784,6 +1783,8 @@ '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', @@ -1801,6 +1802,8 @@ 'browser/policy/profile_policy_context.cc', 'browser/policy/profile_policy_context.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', '<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.cc', '<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.h', 'browser/policy/proto/device_management_constants.cc', |