chrome/browser/ui/webui/policy_ui.cc - Issue 12189011: Split up chrome/browser/policy subdirectory

Unified Diff: chrome/browser/ui/webui/policy_ui.cc

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

Patch Set: gyp cleanup Created 7 years, 9 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/ui/webui/options/browser_options_handler.cc ('K') | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/policy_ui.cc

diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc

index 95db2c873e180b18c41d87be621fb2f46b465f88..db6bed5f11e64382eebfac6e16d5ac234103a91f 100644

--- a/chrome/browser/ui/webui/policy_ui.cc

+++ b/chrome/browser/ui/webui/policy_ui.cc

@@ -15,16 +15,16 @@

#include "base/time.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

+#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

Joao da Silva 2013/03/13 15:54:44 #ifdef OS_CHROMEOS

Mattias Nissler (ping if slow) 2013/03/13 17:30:36 Done.

#include "chrome/browser/policy/browser_policy_connector.h"

-#include "chrome/browser/policy/cloud_policy_client.h"

-#include "chrome/browser/policy/cloud_policy_constants.h"

-#include "chrome/browser/policy/cloud_policy_core.h"

-#include "chrome/browser/policy/cloud_policy_refresh_scheduler.h"

-#include "chrome/browser/policy/cloud_policy_store.h"

-#include "chrome/browser/policy/cloud_policy_validator.h"

+#include "chrome/browser/policy/cloud/cloud_policy_client.h"

+#include "chrome/browser/policy/cloud/cloud_policy_constants.h"

+#include "chrome/browser/policy/cloud/cloud_policy_core.h"

+#include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h"

+#include "chrome/browser/policy/cloud/cloud_policy_store.h"

+#include "chrome/browser/policy/cloud/cloud_policy_validator.h"

+#include "chrome/browser/policy/cloud/message_util.h"

#include "chrome/browser/policy/configuration_policy_handler_list.h"

-#include "chrome/browser/policy/device_local_account_policy_service.h"

-#include "chrome/browser/policy/message_util.h"

#include "chrome/browser/policy/policy_error_map.h"

#include "chrome/browser/policy/policy_map.h"

#include "chrome/browser/policy/policy_service.h"

@@ -44,12 +44,12 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/login/user_manager.h"

-#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"

-#include "chrome/browser/policy/device_local_account_policy_service.h"

-#include "chrome/browser/policy/user_cloud_policy_manager_chromeos.h"

+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

+#include "chrome/browser/chromeos/policy/device_local_account_policy_service.h"

+#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.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 em = enterprise_management;