diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 13:24:32 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-28 13:24:32 +0000 |
| commit | 98818cdcc329b8abf3a32d266cc984a0b06d0fe6 (patch) | |
| tree | 13a59ecd0eb7bb71d4edb41f1133459fab9e6cf7 /chrome_frame | |
| parent | a98ce12635e9c70626950f3bd9ae0e88ee5a357d (diff) | |
| download | chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.zip chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.tar.gz chromium_src-98818cdcc329b8abf3a32d266cc984a0b06d0fe6.tar.bz2 | |
Reland 72784
This is the first step to being able to re-constitute policy from a non-generic protobuf in a policy request in a fully automated way (i.e. the code for the process can be generated). The non-generic protobuf is required for automatic merging of policy on the server-side.
BUG=68309
TEST=existing policy/provider tests
Review URL: http://codereview.chromium.org/6357021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | chrome_frame/policy_settings.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 9527440..de69141 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -146,6 +146,7 @@ '../base/base.gyp:test_support_base', '../ceee/ie/common/common.gyp:ie_common', '../ceee/testing/utils/test_utils.gyp:test_utils', + '../chrome/chrome.gyp:policy', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'chrome_frame_ie', @@ -795,6 +796,7 @@ '../ceee/ie/common/common.gyp:ie_common', '../ceee/ie/common/common.gyp:ie_guids', '../chrome/chrome.gyp:common', + '../chrome/chrome.gyp:policy', '../chrome/chrome.gyp:utility', '../build/temp_gyp/googleurl.gyp:googleurl', '../third_party/libxml/libxml.gyp:libxml', diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc index 116052b..a6741a3 100644 --- a/chrome_frame/policy_settings.cc +++ b/chrome_frame/policy_settings.cc @@ -10,8 +10,8 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" -#include "chrome/common/policy_constants.h" #include "chrome_frame/utils.h" +#include "policy/policy_constants.h" namespace { diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index c5d7c50..a80d427 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/chrome_frame/test/policy_settings_unittest.cc @@ -9,9 +9,9 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" -#include "chrome/common/policy_constants.h" #include "chrome_frame/policy_settings.h" #include "chrome_frame/test/chrome_frame_test_utils.h" +#include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" using base::win::RegKey; |