Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

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

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/profile_policy_connector_factory.h" 5 #include "chrome/browser/policy/profile_policy_connector_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "chrome/browser/policy/profile_policy_connector.h" 9 #include "chrome/browser/policy/profile_policy_connector.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "components/keyed_service/content/browser_context_dependency_manager.h" 11 #include "components/keyed_service/content/browser_context_dependency_manager.h"
12 12
13 #if defined(ENABLE_CONFIGURATION_POLICY) 13 #if defined(ENABLE_CONFIGURATION_POLICY)
14 #include "chrome/browser/policy/schema_registry_service.h" 14 #include "chrome/browser/policy/schema_registry_service.h"
15 #include "chrome/browser/policy/schema_registry_service_factory.h" 15 #include "chrome/browser/policy/schema_registry_service_factory.h"
16 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
17 #include "chrome/browser/chromeos/login/users/user.h"
18 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" 17 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
19 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 18 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
20 #include "chrome/browser/chromeos/profiles/profile_helper.h" 19 #include "chrome/browser/chromeos/profiles/profile_helper.h"
20 #include "components/user_manager/user.h"
21 #else 21 #else
22 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 22 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
23 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" 23 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
24 #endif 24 #endif
25 #endif 25 #endif
26 26
27 namespace policy { 27 namespace policy {
28 28
29 // static 29 // static
30 ProfilePolicyConnectorFactory* ProfilePolicyConnectorFactory::GetInstance() { 30 ProfilePolicyConnectorFactory* ProfilePolicyConnectorFactory::GetInstance() {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 DCHECK(connectors_.find(profile) == connectors_.end()); 87 DCHECK(connectors_.find(profile) == connectors_.end());
88 88
89 SchemaRegistry* schema_registry = NULL; 89 SchemaRegistry* schema_registry = NULL;
90 CloudPolicyManager* user_cloud_policy_manager = NULL; 90 CloudPolicyManager* user_cloud_policy_manager = NULL;
91 91
92 #if defined(ENABLE_CONFIGURATION_POLICY) 92 #if defined(ENABLE_CONFIGURATION_POLICY)
93 schema_registry = 93 schema_registry =
94 SchemaRegistryServiceFactory::GetForContext(profile)->registry(); 94 SchemaRegistryServiceFactory::GetForContext(profile)->registry();
95 95
96 #if defined(OS_CHROMEOS) 96 #if defined(OS_CHROMEOS)
97 chromeos::User* user = NULL; 97 user_manager::User* user = NULL;
98 if (!chromeos::ProfileHelper::IsSigninProfile(profile)) { 98 if (!chromeos::ProfileHelper::IsSigninProfile(profile)) {
99 user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 99 user = chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
100 CHECK(user); 100 CHECK(user);
101 } 101 }
102 user_cloud_policy_manager = 102 user_cloud_policy_manager =
103 UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile); 103 UserCloudPolicyManagerFactoryChromeOS::GetForProfile(profile);
104 #else 104 #else
105 user_cloud_policy_manager = 105 user_cloud_policy_manager =
106 UserCloudPolicyManagerFactory::GetForBrowserContext(profile); 106 UserCloudPolicyManagerFactory::GetForBrowserContext(profile);
107 #endif // defined(OS_CHROMEOS) 107 #endif // defined(OS_CHROMEOS)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 141
142 bool ProfilePolicyConnectorFactory::HasTestingFactory( 142 bool ProfilePolicyConnectorFactory::HasTestingFactory(
143 content::BrowserContext* context) { 143 content::BrowserContext* context) {
144 return false; 144 return false;
145 } 145 }
146 146
147 void ProfilePolicyConnectorFactory::CreateServiceNow( 147 void ProfilePolicyConnectorFactory::CreateServiceNow(
148 content::BrowserContext* context) {} 148 content::BrowserContext* context) {}
149 149
150 } // namespace policy 150 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/profile_policy_connector.cc ('k') | chrome/browser/policy/schema_registry_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698