chrome/browser/policy/browser_policy_connector.cc - Issue 20041002: Make CertificateHandler a proper interface of CertificateImporter.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/browser_policy_connector.cc

Issue 20041002: Make CertificateHandler a proper interface of CertificateImporter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 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:

Index: chrome/browser/policy/browser_policy_connector.cc

diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc

index fa848162030bf265e116f3e6390d7f5ae2ca5858..93d5cc283a4aeed617239dff069286824d4789e3 100644

--- a/chrome/browser/policy/browser_policy_connector.cc

+++ b/chrome/browser/policy/browser_policy_connector.cc

@@ -60,6 +60,7 @@

#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

#include "chrome/browser/chromeos/policy/network_configuration_updater.h"

#include "chrome/browser/chromeos/policy/network_configuration_updater_impl.h"

+#include "chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_provider.h"

#include "chrome/browser/chromeos/settings/device_settings_service.h"

@@ -70,8 +71,8 @@

#include "chromeos/cryptohome/cryptohome_library.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

-#include "chromeos/network/certificate_handler.h"

#include "chromeos/network/managed_network_configuration_handler.h"

+#include "chromeos/network/onc/onc_certificate_importer_impl.h"

#endif

using content::BrowserThread;

@@ -207,10 +208,12 @@ void BrowserPolicyConnector::Init(

policy_statistics_collector_->Initialize();

#if defined(OS_CHROMEOS)

+ scoped_ptr<chromeos::onc::CertificateImporter> cert_importer(

+ new chromeos::onc::CertificateImporterImpl);

network_configuration_updater_.reset(

new NetworkConfigurationUpdaterImpl(

GetPolicyService(),

- make_scoped_ptr(new chromeos::CertificateHandler)));

+ cert_importer.Pass()));

Mattias Nissler (ping if slow) 2013/07/24 11:25:40 why not make_scoped_ptr<chromeos::onc::Certificat

pneubeck (no reviews) 2013/07/25 08:03:23 Done.

#endif

is_initialized_ = true;