diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 12:31:34 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 12:31:34 +0000 |
| commit | 934c6e5446780bf26b8ee9fd171aa69db4b0f253 (patch) | |
| tree | 0b31702844a9ffb41fb84f729d29232c6d85eba1 /chrome_frame | |
| parent | 150f43b345029c037176b4d23c2c32aacd8b6dfc (diff) | |
| download | chromium_src-934c6e5446780bf26b8ee9fd171aa69db4b0f253.zip chromium_src-934c6e5446780bf26b8ee9fd171aa69db4b0f253.tar.gz chromium_src-934c6e5446780bf26b8ee9fd171aa69db4b0f253.tar.bz2 | |
Revert 72784 - Policy: generate boilerplate policy type and constant code.
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/6002015
TBR=danno@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72785 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, 2 insertions, 4 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index de69141..9527440 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -146,7 +146,6 @@ '../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', @@ -796,7 +795,6 @@ '../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 a6741a3..116052b 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 a80d427..c5d7c50 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; |