summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 09:53:40 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-14 09:53:40 +0000
commitb39d2571ff918f440aabd5dc5ca408c070460adf (patch)
tree2c36230ce3e7676e63ff4fca800f8298d9c29afe /chrome/browser/prefs
parentcdb48c28edec33ed0d2d2c11fda4a6ca4e65051a (diff)
downloadchromium_src-b39d2571ff918f440aabd5dc5ca408c070460adf.zip
chromium_src-b39d2571ff918f440aabd5dc5ca408c070460adf.tar.gz
chromium_src-b39d2571ff918f440aabd5dc5ca408c070460adf.tar.bz2
Split up chrome/browser/policy subdirectory
chrome/browser/policy had grown a little, so I moved the cloud policy implementation to chrome/browser/policy/cloud and the chromeos-specific stuff to chrome/browser/chromeos/policy. BUG=None TEST=Compiles and passes tests. Review URL: https://codereview.chromium.org/12189011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index b3f9f2b..97348eb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -123,13 +123,13 @@
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/wallpaper_manager.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
+#include "chrome/browser/chromeos/policy/device_status_collector.h"
#include "chrome/browser/chromeos/preferences.h"
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#include "chrome/browser/chromeos/settings/device_settings_cache.h"
#include "chrome/browser/chromeos/status/data_promo_notification.h"
-#include "chrome/browser/policy/auto_enrollment_client.h"
-#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/policy/device_status_collector.h"
#else
#include "chrome/browser/extensions/default_apps.h"
#endif