OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/chromeos/policy/user_network_configuration_updater_fact ory.h" | 5 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" | 8 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" |
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 9 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
10 #include "chrome/browser/net/cert_database_service_factory.h" | |
10 #include "chrome/browser/policy/profile_policy_connector.h" | 11 #include "chrome/browser/policy/profile_policy_connector.h" |
11 #include "chrome/browser/policy/profile_policy_connector_factory.h" | 12 #include "chrome/browser/policy/profile_policy_connector_factory.h" |
12 #include "chrome/browser/profiles/incognito_helpers.h" | 13 #include "chrome/browser/profiles/incognito_helpers.h" |
13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/common/pref_names.h" | 15 #include "chrome/common/pref_names.h" |
15 #include "chromeos/network/network_handler.h" | 16 #include "chromeos/network/network_handler.h" |
17 #include "chromeos/network/onc/onc_certificate_importer_impl.h" | |
18 #include "components/cert_database/public/cert_database_service.h" | |
16 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 19 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
17 #include "components/policy/core/common/cloud/cloud_policy_constants.h" | 20 #include "components/policy/core/common/cloud/cloud_policy_constants.h" |
18 #include "components/user_manager/user.h" | 21 #include "components/user_manager/user.h" |
19 #include "components/user_manager/user_manager.h" | 22 #include "components/user_manager/user_manager.h" |
20 #include "components/user_manager/user_type.h" | 23 #include "components/user_manager/user_type.h" |
24 #include "content/public/browser/browser_thread.h" | |
21 | 25 |
22 namespace policy { | 26 namespace policy { |
23 | 27 |
24 // static | 28 // static |
25 UserNetworkConfigurationUpdater* | 29 UserNetworkConfigurationUpdater* |
26 UserNetworkConfigurationUpdaterFactory::GetForProfile(Profile* profile) { | 30 UserNetworkConfigurationUpdaterFactory::GetForProfile(Profile* profile) { |
27 return static_cast<UserNetworkConfigurationUpdater*>( | 31 return static_cast<UserNetworkConfigurationUpdater*>( |
28 GetInstance()->GetServiceForBrowserContext(profile, true)); | 32 GetInstance()->GetServiceForBrowserContext(profile, true)); |
29 } | 33 } |
30 | 34 |
31 // static | 35 // static |
32 UserNetworkConfigurationUpdaterFactory* | 36 UserNetworkConfigurationUpdaterFactory* |
33 UserNetworkConfigurationUpdaterFactory::GetInstance() { | 37 UserNetworkConfigurationUpdaterFactory::GetInstance() { |
34 return Singleton<UserNetworkConfigurationUpdaterFactory>::get(); | 38 return Singleton<UserNetworkConfigurationUpdaterFactory>::get(); |
35 } | 39 } |
36 | 40 |
37 UserNetworkConfigurationUpdaterFactory::UserNetworkConfigurationUpdaterFactory() | 41 UserNetworkConfigurationUpdaterFactory::UserNetworkConfigurationUpdaterFactory() |
38 : BrowserContextKeyedServiceFactory( | 42 : BrowserContextKeyedServiceFactory( |
39 "UserNetworkConfigurationUpdater", | 43 "UserNetworkConfigurationUpdater", |
40 BrowserContextDependencyManager::GetInstance()) { | 44 BrowserContextDependencyManager::GetInstance()) { |
41 DependsOn(ProfilePolicyConnectorFactory::GetInstance()); | 45 DependsOn(ProfilePolicyConnectorFactory::GetInstance()); |
46 DependsOn(cert_database::CertDatabaseServiceFactory::GetInstance()); | |
42 } | 47 } |
43 | 48 |
44 UserNetworkConfigurationUpdaterFactory:: | 49 UserNetworkConfigurationUpdaterFactory:: |
45 ~UserNetworkConfigurationUpdaterFactory() {} | 50 ~UserNetworkConfigurationUpdaterFactory() {} |
46 | 51 |
47 content::BrowserContext* | 52 content::BrowserContext* |
48 UserNetworkConfigurationUpdaterFactory::GetBrowserContextToUse( | 53 UserNetworkConfigurationUpdaterFactory::GetBrowserContextToUse( |
49 content::BrowserContext* context) const { | 54 content::BrowserContext* context) const { |
50 return chrome::GetBrowserContextRedirectedInIncognito(context); | 55 return chrome::GetBrowserContextRedirectedInIncognito(context); |
51 } | 56 } |
(...skipping 21 matching lines...) Expand all Loading... | |
73 // also http://crbug.com/310685 . | 78 // also http://crbug.com/310685 . |
74 if (user != user_manager::UserManager::Get()->GetPrimaryUser()) | 79 if (user != user_manager::UserManager::Get()->GetPrimaryUser()) |
75 return NULL; | 80 return NULL; |
76 | 81 |
77 const bool allow_trusted_certs_from_policy = | 82 const bool allow_trusted_certs_from_policy = |
78 user->GetType() == user_manager::USER_TYPE_REGULAR; | 83 user->GetType() == user_manager::USER_TYPE_REGULAR; |
79 | 84 |
80 ProfilePolicyConnector* profile_connector = | 85 ProfilePolicyConnector* profile_connector = |
81 ProfilePolicyConnectorFactory::GetForProfile(profile); | 86 ProfilePolicyConnectorFactory::GetForProfile(profile); |
82 | 87 |
88 cert_database::CertDatabaseService* cert_service = | |
89 cert_database::CertDatabaseServiceFactory::GetForBrowserContext(context); | |
90 | |
91 scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer( | |
92 new chromeos::onc::CertificateImporterImpl( | |
93 content::BrowserThread::GetMessageLoopProxyForThread( | |
94 content::BrowserThread::IO), | |
95 cert_service->GetIOPart())); | |
Joao da Silva
2014/10/30 09:48:01
cert_service may be NULL
pneubeck (no reviews)
2014/11/05 14:53:36
Done.
pneubeck (no reviews)
2014/11/05 14:53:36
Done.
| |
96 | |
83 return UserNetworkConfigurationUpdater::CreateForUserPolicy( | 97 return UserNetworkConfigurationUpdater::CreateForUserPolicy( |
84 profile, | 98 allow_trusted_certs_from_policy, |
85 allow_trusted_certs_from_policy, | 99 *user, |
86 *user, | 100 profile_connector->policy_service(), |
87 profile_connector->policy_service(), | 101 certificate_importer.Pass(), |
88 chromeos::NetworkHandler::Get()->managed_network_configuration_handler()) | 102 chromeos::NetworkHandler::Get() |
89 .release(); | 103 ->managed_network_configuration_handler()).release(); |
90 } | 104 } |
91 | 105 |
92 } // namespace policy | 106 } // namespace policy |
OLD | NEW |