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

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

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cert manager basics working Created 7 years, 2 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.h" 5 #include "chrome/browser/policy/profile_policy_connector.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 connector->SetUserPolicyDelegate(cloud_policy_manager); 97 connector->SetUserPolicyDelegate(cloud_policy_manager);
98 else if (special_user_policy_provider_) 98 else if (special_user_policy_provider_)
99 connector->SetUserPolicyDelegate(special_user_policy_provider_.get()); 99 connector->SetUserPolicyDelegate(special_user_policy_provider_.get());
100 100
101 // A reference to |user| is stored by the NetworkConfigurationUpdater until 101 // A reference to |user| is stored by the NetworkConfigurationUpdater until
102 // the Updater is destructed during Shutdown. 102 // the Updater is destructed during Shutdown.
103 network_configuration_updater_ = 103 network_configuration_updater_ =
104 UserNetworkConfigurationUpdater::CreateForUserPolicy( 104 UserNetworkConfigurationUpdater::CreateForUserPolicy(
105 allow_trusted_certs_from_policy, 105 allow_trusted_certs_from_policy,
106 *user, 106 *user,
107 //XXX
107 scoped_ptr<chromeos::onc::CertificateImporter>( 108 scoped_ptr<chromeos::onc::CertificateImporter>(
108 new chromeos::onc::CertificateImporterImpl), 109 new chromeos::onc::CertificateImporterImpl),
109 policy_service(), 110 policy_service(),
110 chromeos::NetworkHandler::Get() 111 chromeos::NetworkHandler::Get()
111 ->managed_network_configuration_handler()); 112 ->managed_network_configuration_handler());
112 } 113 }
113 #endif 114 #endif
114 } 115 }
115 116
116 void ProfilePolicyConnector::InitForTesting(scoped_ptr<PolicyService> service) { 117 void ProfilePolicyConnector::InitForTesting(scoped_ptr<PolicyService> service) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 connector->GetDeviceLocalAccountPolicyService(); 169 connector->GetDeviceLocalAccountPolicyService();
169 if (!device_local_account_policy_service) 170 if (!device_local_account_policy_service)
170 return; 171 return;
171 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider( 172 special_user_policy_provider_.reset(new DeviceLocalAccountPolicyProvider(
172 username, device_local_account_policy_service)); 173 username, device_local_account_policy_service));
173 special_user_policy_provider_->Init(); 174 special_user_policy_provider_->Init();
174 } 175 }
175 #endif 176 #endif
176 177
177 } // namespace policy 178 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/browser_policy_connector.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698