chromeos/network/network_change_notifier_chromeos.cc - Issue 23712002: Cleanup network type matching.

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: chromeos/network/network_change_notifier_chromeos.cc

Issue 23712002: Cleanup network type matching. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added unit tests and rebased. Created 7 years, 3 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: chromeos/network/network_change_notifier_chromeos.cc

diff --git a/chromeos/network/network_change_notifier_chromeos.cc b/chromeos/network/network_change_notifier_chromeos.cc

index 706dcfd71c518585a12258bce0f5e63663c732ee..67067b3f776b78f78cc7aae16ddfc6055a5aa953 100644

--- a/chromeos/network/network_change_notifier_chromeos.cc

+++ b/chromeos/network/network_change_notifier_chromeos.cc

@@ -196,7 +196,7 @@ void NetworkChangeNotifierChromeos::UpdateState(

net::NetworkChangeNotifier::ConnectionType

NetworkChangeNotifierChromeos::ConnectionTypeFromShill(

const std::string& type, const std::string& technology) {

- if (type == flimflam::kTypeEthernet)

+ if (type == flimflam::kTypeEthernet || type == shill::kTypeEthernetEap)

stevenjb 2013/09/04 20:40:39 We should probably use MatchType here, just to kee

pneubeck (no reviews) 2013/09/05 08:28:34 Done.

return CONNECTION_ETHERNET;

else if (type == flimflam::kTypeWifi)

return CONNECTION_WIFI;