| Index: chrome/browser/policy/browser_policy_connector.cc
|
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
|
| index debfef3a40ead50398df3bf18a4fb390e5cb1de3..722fa6d5df412ba4450bf2834e94dcb1dcd18283 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -17,10 +17,10 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/policy/async_policy_provider.h"
|
| -#include "chrome/browser/policy/cloud_policy_client.h"
|
| -#include "chrome/browser/policy/cloud_policy_service.h"
|
| +#include "chrome/browser/policy/cloud/cloud_policy_client.h"
|
| +#include "chrome/browser/policy/cloud/cloud_policy_service.h"
|
| +#include "chrome/browser/policy/cloud/device_management_service.h"
|
| #include "chrome/browser/policy/configuration_policy_provider.h"
|
| -#include "chrome/browser/policy/device_management_service.h"
|
| #include "chrome/browser/policy/managed_mode_policy_provider.h"
|
| #include "chrome/browser/policy/policy_service_impl.h"
|
| #include "chrome/browser/policy/policy_statistics_collector.h"
|
| @@ -49,26 +49,26 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/chromeos/cros/cros_library.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| +#include "chrome/browser/chromeos/policy/app_pack_updater.h"
|
| +#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
|
| +#include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
|
| +#include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h"
|
| +#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"
|
| +#include "chrome/browser/chromeos/policy/device_status_collector.h"
|
| +#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
|
| +#include "chrome/browser/chromeos/policy/network_configuration_updater.h"
|
| +#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
|
| +#include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
|
| #include "chrome/browser/chromeos/settings/device_settings_service.h"
|
| #include "chrome/browser/chromeos/system/statistics_provider.h"
|
| #include "chrome/browser/chromeos/system/timezone_settings.h"
|
| -#include "chrome/browser/policy/app_pack_updater.h"
|
| -#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
|
| -#include "chrome/browser/policy/device_cloud_policy_store_chromeos.h"
|
| -#include "chrome/browser/policy/device_local_account_policy_provider.h"
|
| -#include "chrome/browser/policy/device_local_account_policy_service.h"
|
| -#include "chrome/browser/policy/device_status_collector.h"
|
| -#include "chrome/browser/policy/enterprise_install_attributes.h"
|
| -#include "chrome/browser/policy/network_configuration_updater.h"
|
| -#include "chrome/browser/policy/resource_cache.h"
|
| -#include "chrome/browser/policy/user_cloud_policy_manager_chromeos.h"
|
| -#include "chrome/browser/policy/user_cloud_policy_store_chromeos.h"
|
| +#include "chrome/browser/policy/cloud/resource_cache.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #else
|
| -#include "chrome/browser/policy/user_cloud_policy_manager.h"
|
| -#include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
|
| +#include "chrome/browser/policy/cloud/user_cloud_policy_manager.h"
|
| +#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
|
| #endif
|
|
|
| using content::BrowserThread;
|
|
|