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

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

Patch Set: . 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: chromeos/network/onc/onc_translator_shill_to_onc.cc

diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc

index 4360d25f03708b3debe78c76cdd41a73856a5e6e..3b630eace50e5cf6bff761a394b9d3868cf91ec7 100644

--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc

+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc

@@ -434,8 +434,8 @@ void ShillToONCTranslator::TranslateNetworkWithState() {

}

onc_object_->SetStringWithoutPathExpansion(

::onc::network_config::kConnectionState, onc_state);

- // Only set 'RestrictedConnectivity' if true.

- if (state == shill::kStatePortal) {

+ // Only set 'RestrictedConnectivity' if captive portal state is true.

+ if (NetworkState::NetworkStateIsCaptivePortal(*shill_dictionary_)) {

onc_object_->SetBooleanWithoutPathExpansion(

::onc::network_config::kRestrictedConnectivity, true);

}