chrome/browser/ui/webui/chromeos/login/network_state_informer.cc - Issue 873713004: Introduce NetworkState::is_captive_portal()

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/ui/webui/chromeos/login/network_state_informer.cc

Issue 873713004: Introduce NetworkState::is_captive_portal() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Feedback, unit test Created 5 years, 11 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/ui/webui/chromeos/login/network_state_informer.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

index ad93d441b8fe92d740f29defe99969a23cc34212..af577ff1d0cdf3336a62e3b3cb70c2d33931003d 100644

--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.cc

@@ -70,14 +70,14 @@ NetworkStateInformer::State GetStateForDefaultNetwork() {

}

if (status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL ||

(status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN &&

- network->connection_state() == shill::kStatePortal))

+ network->is_captive_portal()))

return NetworkStateInformer::CAPTIVE_PORTAL;

} else {

if (NetworkState::StateIsConnecting(network->connection_state()))

return NetworkStateInformer::CONNECTING;

if (network->connection_state() == shill::kStateOnline)

return NetworkStateInformer::ONLINE;

- if (network->connection_state() == shill::kStatePortal)

+ if (network->is_captive_portal())

return NetworkStateInformer::CAPTIVE_PORTAL;

}

return NetworkStateInformer::OFFLINE;