ash/system/chromeos/network/network_state_notifier.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: ash/system/chromeos/network/network_state_notifier.cc

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

Patch Set: Fixed unit test in Debug. 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: ash/system/chromeos/network/network_state_notifier.cc

diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc

index e9aa016e82917c04f2952a703413d1f6680ad7c5..f54c3e7f06d7761aee44997ab4e2169fbc7c9d4c 100644

--- a/ash/system/chromeos/network/network_state_notifier.cc

+++ b/ash/system/chromeos/network/network_state_notifier.cc

@@ -29,6 +29,7 @@ using chromeos::NetworkConnectionHandler;

using chromeos::NetworkHandler;

using chromeos::NetworkState;

using chromeos::NetworkStateHandler;

+using chromeos::NetworkTypePattern;

namespace {

@@ -138,8 +139,7 @@ void NetworkStateNotifier::UpdateCellularOutOfCredits(

const NetworkState* default_network = handler->DefaultNetwork();

if (default_network && default_network != cellular)

return;

- if (handler->ConnectingNetworkByType(

- NetworkStateHandler::kMatchTypeNonVirtual) ||

+ if (handler->ConnectingNetworkByType(NetworkTypePattern::NonVirtual()) ||

NetworkHandler::Get()->network_connection_handler()

->HasPendingConnectRequest())

return;