From 76b4b15804dafa5e586738bd7c8ac12fea6ddec2 Mon Sep 17 00:00:00 2001 From: "joaodasilva@chromium.org" Date: Sun, 8 Dec 2013 21:10:04 +0000 Subject: Move policy code into components/policy. The code moved to component/policy can be included on iOS, but can't depend on chrome/. This move includes an exception for the policy protobufs: - the generic cloud policy protobufs will be moved into a new repository, due to a dependency from a ChromeOS package - the user cloud policy protobuf and its decoding will move into a new component for user policy BUG=271392 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/109743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239399 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/browser_process_impl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/browser_process_impl.cc') diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 09e20ef..74597c3 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -53,7 +53,6 @@ #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/plugins/chrome_plugin_service_filter.h" #include "chrome/browser/plugins/plugin_finder.h" -#include "chrome/browser/policy/policy_service.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/chrome_pref_service_factory.h" #include "chrome/browser/prerender/prerender_tracker.h" @@ -79,6 +78,7 @@ #include "chrome/common/switch_utils.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/google_update_constants.h" +#include "components/policy/core/common/policy_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_details.h" @@ -94,7 +94,7 @@ #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/policy/browser_policy_connector.h" #else -#include "chrome/browser/policy/policy_service_stub.h" +#include "components/policy/core/common/policy_service_stub.h" #endif // defined(ENABLE_CONFIGURATION_POLICY) #if defined(OS_WIN) -- cgit v1.1