chrome/browser/chromeos/cros/network_library.cc - Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary

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 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Restore check VPN PassphraseRequred 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/cros/network_library.h ('k') | chrome/browser/chromeos/cros/network_library_unittest.cc » ('j') | chrome/browser/chromeos/options/network_config_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c84eaaa651ac1411a7d4b55cc62213e7b9c63f8b..8c6f558fd06b1f3960c69f788870b65dcaa47703 100644

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

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

@@ -15,6 +15,7 @@

#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/browser/chromeos/enrollment_dialog_view.h"

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

#include "chromeos/network/certificate_pattern.h"

#include "chromeos/network/certificate_pattern_matcher.h"

@@ -331,6 +332,10 @@ bool Network::RequiresUserProfile() const {

void Network::CopyCredentialsFromRemembered(Network* remembered) {

}

+void Network::SetEnrollmentDelegate(EnrollmentDelegate* delegate) {

+ enrollment_delegate_.reset(delegate);

void Network::SetValueProperty(const char* prop, const base::Value& value) {

DCHECK(prop);

if (!EnsureRunningOnChromeOS())