chrome/browser/chromeos/policy/network_configuration_updater_impl.cc - Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network

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/chromeos/policy/network_configuration_updater_impl.cc

Issue 14729017: Add NetworkHandler to own network handlers in src/chromeos/network (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix chromeos_unittests Created 7 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/policy/network_configuration_updater_impl.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc b/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

index bf7c7adae6fe245f88034f5f64daf2ec37ad4353..30b15ba4439ceee8ac5a258960beeff2bb377393 100644

--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl.cc

@@ -21,12 +21,10 @@ namespace policy {

NetworkConfigurationUpdaterImpl::NetworkConfigurationUpdaterImpl(

PolicyService* policy_service,

- chromeos::ManagedNetworkConfigurationHandler* network_config_handler,

scoped_ptr<chromeos::CertificateHandler> certificate_handler)

: policy_change_registrar_(

policy_service, PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())),

policy_service_(policy_service),

- network_config_handler_(network_config_handler),

certificate_handler_(certificate_handler.Pass()) {

policy_change_registrar_.Observe(

key::kDeviceOpenNetworkConfiguration,

@@ -96,7 +94,8 @@ void NetworkConfigurationUpdaterImpl::ApplyNetworkConfiguration(

std::string userhash = onc_source == chromeos::onc::ONC_SOURCE_USER_POLICY ?

hashed_username_ : std::string();

- network_config_handler_->SetPolicy(onc_source, userhash, network_configs);

+ chromeos::NetworkHandler::Get()->managed_network_configuration_handler()->

+ SetPolicy(onc_source, userhash, network_configs);

scoped_ptr<net::CertificateList> web_trust_certs(new net::CertificateList);

certificate_handler_->ImportCertificates(