summaryrefslogtreecommitdiffstats
path: root/chrome_frame/policy_settings.cc
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 12:31:34 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-27 12:31:34 +0000
commit934c6e5446780bf26b8ee9fd171aa69db4b0f253 (patch)
tree0b31702844a9ffb41fb84f729d29232c6d85eba1 /chrome_frame/policy_settings.cc
parent150f43b345029c037176b4d23c2c32aacd8b6dfc (diff)
downloadchromium_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/policy_settings.cc')
-rw-r--r--chrome_frame/policy_settings.cc2
1 files changed, 1 insertions, 1 deletions
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 {