chrome/browser/chromeos/cros/network_library.cc - Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/.

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/cros/network_library.cc

Issue 13454006: Moving ManagedNetworkConfigurationHandler to chromeos/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Cleaned up parsing of NetworkUIData. Created 7 years, 8 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/chromeos/cros/network_library.cc

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc

index ba3078b6dc26a3017d211d8abde1016814f50023..dd6b5d5a79870890c1902f00581475b96130ebb3 100644

--- a/chrome/browser/chromeos/cros/network_library.cc

+++ b/chrome/browser/chromeos/cros/network_library.cc

@@ -10,13 +10,14 @@

#include "base/json/json_writer.h" // for debug output only.

#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversion_utils.h"

-#include "chrome/browser/chromeos/cros/certificate_pattern.h"

+#include "chrome/browser/chromeos/cros/certificate_pattern_matcher.h"

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/cros/native_network_constants.h"

#include "chrome/browser/chromeos/cros/native_network_parser.h"

#include "chrome/browser/chromeos/cros/network_library_impl_cros.h"

#include "chrome/browser/chromeos/cros/network_library_impl_stub.h"

#include "chrome/common/net/x509_certificate_model.h"

+#include "chromeos/network/certificate_pattern.h"

#include "chromeos/network/cros_network_functions.h"

#include "chromeos/network/network_state_handler.h"

#include "content/public/browser/browser_thread.h"

@@ -778,7 +779,7 @@ void VirtualNetwork::MatchCertificatePattern(bool allow_enroll,

}

scoped_refptr<net::X509Certificate> matching_cert =

- client_cert_pattern().GetMatch();

+ GetCertificateMatch(client_cert_pattern());

if (matching_cert.get()) {

std::string client_cert_id =

x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle());

@@ -1300,7 +1301,7 @@ void WifiNetwork::MatchCertificatePattern(bool allow_enroll,

}

scoped_refptr<net::X509Certificate> matching_cert =

- client_cert_pattern().GetMatch();

+ GetCertificateMatch(client_cert_pattern());

if (matching_cert.get()) {

SetEAPClientCertPkcs11Id(

x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle()));