Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: components/policy/core/common/cloud/policy_builder.h

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/policy/core/common/cloud/policy_builder.h
diff --git a/components/policy/core/common/cloud/policy_builder.h b/components/policy/core/common/cloud/policy_builder.h
index 625f8dd98cbc827d8bdeaa573e2c5801646c438d..b8a1ad526026434ec6b6fc432e1f0dbf22872d88 100644
--- a/components/policy/core/common/cloud/policy_builder.h
+++ b/components/policy/core/common/cloud/policy_builder.h
@@ -11,10 +11,13 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"
-#include "chrome/browser/policy/proto/cloud/device_management_local.pb.h"
#include "crypto/rsa_private_key.h"
#include "policy/proto/cloud_policy.pb.h"
+#include "policy/proto/device_management_backend.pb.h"
+
+#if !defined(OS_ANDROID)
+#include "policy/proto/chrome_extension_policy.pb.h"
+#endif
namespace policy {
@@ -132,8 +135,11 @@ class TypedPolicyBuilder : public PolicyBuilder {
typedef TypedPolicyBuilder<enterprise_management::CloudPolicySettings>
UserPolicyBuilder;
+
+#if !defined(OS_ANDROID)
typedef TypedPolicyBuilder<enterprise_management::ExternalPolicyData>
ComponentPolicyBuilder;
+#endif
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698