chrome/browser/policy/browser_policy_connector.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 12189011: Split up chrome/browser/policy subdirectory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 7 years, 10 months 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

« chrome/browser/policy/browser_policy_connector.h ('K') | « chrome/browser/policy/browser_policy_connector.h ('k') | chrome/browser/policy/cloud/cloud_policy_browsertest.cc » ('j') | chrome/chrome_browser.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8b30543c14c0fc1b769c2721282c3e8e4c6c1892..f30f7035120943d9ff96edc91ee692bcd4b72476 100644

--- a/chrome/browser/policy/browser_policy_connector.cc

+++ b/chrome/browser/policy/browser_policy_connector.cc

@@ -14,10 +14,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"

@@ -46,25 +46,25 @@

#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/user_cloud_policy_manager_chromeos.h"

-#include "chrome/browser/policy/user_cloud_policy_store_chromeos.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

namespace policy {