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/policy_cert_service_factory.h" | 5 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "base/prefs/scoped_user_pref_update.h" | 10 #include "base/prefs/scoped_user_pref_update.h" |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 DependsOn(UserNetworkConfigurationUpdaterFactory::GetInstance()); | 88 DependsOn(UserNetworkConfigurationUpdaterFactory::GetInstance()); |
89 } | 89 } |
90 | 90 |
91 PolicyCertServiceFactory::~PolicyCertServiceFactory() {} | 91 PolicyCertServiceFactory::~PolicyCertServiceFactory() {} |
92 | 92 |
93 KeyedService* PolicyCertServiceFactory::BuildServiceInstanceFor( | 93 KeyedService* PolicyCertServiceFactory::BuildServiceInstanceFor( |
94 content::BrowserContext* context) const { | 94 content::BrowserContext* context) const { |
95 Profile* profile = static_cast<Profile*>(context); | 95 Profile* profile = static_cast<Profile*>(context); |
96 | 96 |
97 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 97 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
98 user_manager::User* user = chromeos::ProfileHelper::Get()->GetUserByProfile( | 98 const user_manager::User* user = |
99 profile->GetOriginalProfile()); | 99 chromeos::ProfileHelper::Get()->GetUserByProfile( |
| 100 profile->GetOriginalProfile()); |
100 if (!user) | 101 if (!user) |
101 return NULL; | 102 return NULL; |
102 | 103 |
103 // Backwards compatibility: profiles that used policy-pushed certificates used | 104 // Backwards compatibility: profiles that used policy-pushed certificates used |
104 // to have this condition marked in their prefs. This signal has moved to | 105 // to have this condition marked in their prefs. This signal has moved to |
105 // local_state though, to support checking it before the profile is loaded. | 106 // local_state though, to support checking it before the profile is loaded. |
106 // Check the profile here and update the local_state, if appropriate. | 107 // Check the profile here and update the local_state, if appropriate. |
107 // TODO(joaodasilva): remove this, eventually. | 108 // TODO(joaodasilva): remove this, eventually. |
108 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); | 109 PrefService* prefs = profile->GetOriginalProfile()->GetPrefs(); |
109 if (prefs->GetBoolean(prefs::kUsedPolicyCertificatesOnce)) { | 110 if (prefs->GetBoolean(prefs::kUsedPolicyCertificatesOnce)) { |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 prefs::kUsedPolicyCertificatesOnce, | 144 prefs::kUsedPolicyCertificatesOnce, |
144 false, | 145 false, |
145 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 146 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
146 } | 147 } |
147 | 148 |
148 bool PolicyCertServiceFactory::ServiceIsNULLWhileTesting() const { | 149 bool PolicyCertServiceFactory::ServiceIsNULLWhileTesting() const { |
149 return true; | 150 return true; |
150 } | 151 } |
151 | 152 |
152 } // namespace policy | 153 } // namespace policy |
OLD | NEW |