summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame.gyp
diff options
context:
space:
mode:
authorjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
committerjkummerow@chromium.org <jkummerow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-16 09:36:09 +0000
commit43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd (patch)
tree3ecf01593abb3493a44ca269ca521d562431be42 /chrome_frame/chrome_frame.gyp
parentbe24d307cfb3aba57e4456063eb31207665ce657 (diff)
downloadchromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.zip
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.gz
chromium_src-43aca00e01ed07ffbbe18f72e08d2cc0d9dfe8cd.tar.bz2
New policy protobuf protocol.
- cloud_policy.proto autogenerated from policy_templates.json - C++ method decoding the protobuf 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/6409040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
-rw-r--r--chrome_frame/chrome_frame.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 4bde4aa..00662af4 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -109,7 +109,7 @@
'type': 'executable',
'dependencies': [
'../base/base.gyp:test_support_base',
- '../chrome/chrome.gyp:policy',
+ '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'chrome_frame_ie',
@@ -757,7 +757,7 @@
'chrome_frame_utils',
'chrome_tab_idl',
'../chrome/chrome.gyp:common',
- '../chrome/chrome.gyp:policy',
+ '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
'../chrome/chrome.gyp:utility',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../third_party/libxml/libxml.gyp:libxml',