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

Side by Side Diff: chrome/browser/policy/browser_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) 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"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 308
309 policy_statistics_collector_.reset( 309 policy_statistics_collector_.reset(
310 new policy::PolicyStatisticsCollector( 310 new policy::PolicyStatisticsCollector(
311 GetPolicyService(), 311 GetPolicyService(),
312 local_state_, 312 local_state_,
313 base::MessageLoop::current()->message_loop_proxy())); 313 base::MessageLoop::current()->message_loop_proxy()));
314 policy_statistics_collector_->Initialize(); 314 policy_statistics_collector_->Initialize();
315 315
316 #if defined(OS_CHROMEOS) 316 #if defined(OS_CHROMEOS)
317 network_configuration_updater_ = 317 network_configuration_updater_ =
318 // XXX
318 NetworkConfigurationUpdater::CreateForDevicePolicy( 319 NetworkConfigurationUpdater::CreateForDevicePolicy(
319 scoped_ptr<chromeos::onc::CertificateImporter>( 320 scoped_ptr<chromeos::onc::CertificateImporter>(
320 new chromeos::onc::CertificateImporterImpl), 321 new chromeos::onc::CertificateImporterImpl),
321 GetPolicyService(), 322 GetPolicyService(),
322 chromeos::NetworkHandler::Get() 323 chromeos::NetworkHandler::Get()
323 ->managed_network_configuration_handler()); 324 ->managed_network_configuration_handler());
324 #endif 325 #endif
325 326
326 is_initialized_ = true; 327 is_initialized_ = true;
327 } 328 }
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 return new AsyncPolicyProvider(loader.Pass()); 574 return new AsyncPolicyProvider(loader.Pass());
574 } else { 575 } else {
575 return NULL; 576 return NULL;
576 } 577 }
577 #else 578 #else
578 return NULL; 579 return NULL;
579 #endif 580 #endif
580 } 581 }
581 582
582 } // namespace policy 583 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/net/nss_slot_factory.cc ('k') | chrome/browser/policy/profile_policy_connector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698