chrome/browser/policy/browser_policy_connector.cc - Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

Side by Side Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 23376002: Move ManagedModePolicyProvider functionality to ManagedUserSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/managed_mode/managed_user_settings_service.cc ('K') | « chrome/browser/managed_mode/managed_user_settings_service_unittest.cc ('k') | chrome/browser/policy/configuration_policy_handler_list.cc » ('j') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

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

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <iterator>	8 #include <iterator>

9	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/bind_helpers.h"	11 #include "base/bind_helpers.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/files/file_path.h"	13 #include "base/files/file_path.h"

14 #include "base/logging.h"	14 #include "base/logging.h"

15 #include "base/message_loop/message_loop.h"	15 #include "base/message_loop/message_loop.h"

16 #include "base/message_loop/message_loop_proxy.h"	16 #include "base/message_loop/message_loop_proxy.h"

17 #include "base/path_service.h"	17 #include "base/path_service.h"

18 #include "base/prefs/pref_registry_simple.h"	18 #include "base/prefs/pref_registry_simple.h"

19 #include "base/prefs/pref_service.h"	19 #include "base/prefs/pref_service.h"

20 #include "base/strings/string_util.h"	20 #include "base/strings/string_util.h"

21 #include "base/strings/sys_string_conversions.h"	21 #include "base/strings/sys_string_conversions.h"

22 #include "base/strings/utf_string_conversions.h"	22 #include "base/strings/utf_string_conversions.h"

23 #include "chrome/browser/browser_process.h"	23 #include "chrome/browser/browser_process.h"

24 #include "chrome/browser/policy/async_policy_provider.h"	24 #include "chrome/browser/policy/async_policy_provider.h"

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

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

27 #include "chrome/browser/policy/cloud/cloud_policy_service.h"	27 #include "chrome/browser/policy/cloud/cloud_policy_service.h"

28 #include "chrome/browser/policy/cloud/device_management_service.h"	28 #include "chrome/browser/policy/cloud/device_management_service.h"

29 #include "chrome/browser/policy/configuration_policy_provider.h"	29 #include "chrome/browser/policy/configuration_policy_provider.h"

30 #include "chrome/browser/policy/managed_mode_policy_provider.h"

31 #include "chrome/browser/policy/policy_domain_descriptor.h"	30 #include "chrome/browser/policy/policy_domain_descriptor.h"

32 #include "chrome/browser/policy/policy_service_impl.h"	31 #include "chrome/browser/policy/policy_service_impl.h"

33 #include "chrome/browser/policy/policy_statistics_collector.h"	32 #include "chrome/browser/policy/policy_statistics_collector.h"

34 #include "chrome/common/chrome_paths.h"	33 #include "chrome/common/chrome_paths.h"

35 #include "chrome/common/chrome_switches.h"	34 #include "chrome/common/chrome_switches.h"

36 #include "chrome/common/pref_names.h"	35 #include "chrome/common/pref_names.h"

37 #include "content/public/browser/browser_thread.h"	36 #include "content/public/browser/browser_thread.h"

38 #include "google_apis/gaia/gaia_auth_util.h"	37 #include "google_apis/gaia/gaia_auth_util.h"

39 #include "google_apis/gaia/gaia_constants.h"	38 #include "google_apis/gaia/gaia_constants.h"

40 #include "grit/generated_resources.h"	39 #include "grit/generated_resources.h"

(...skipping 457 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
498 return new AsyncPolicyProvider(loader.Pass());	497 return new AsyncPolicyProvider(loader.Pass());

499 } else {	498 } else {

500 return NULL;	499 return NULL;

501 }	500 }

502 #else	501 #else

503 return NULL;	502 return NULL;

504 #endif	503 #endif

505 }	504 }

506	505

507 } // namespace policy	506 } // namespace policy

OLD	NEW