ui/chromeos/network/network_icon.cc - Issue 425783003: athena: Add a network-selector widget.

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

Issue 425783003: athena: Add a network-selector widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tot-merge Created 6 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:

Index: ui/chromeos/network/network_icon.cc

diff --git a/ui/chromeos/network/network_icon.cc b/ui/chromeos/network/network_icon.cc

index a19b868e556a8a1e04d82afdcf41ba566c91dc45..3d274d5866f057bb572e13cd03615899b9f6b466 100644

--- a/ui/chromeos/network/network_icon.cc

+++ b/ui/chromeos/network/network_icon.cc

@@ -641,7 +641,7 @@ bool NetworkIconImpl::UpdateCellularState(const NetworkState* network) {

bool NetworkIconImpl::UpdatePortalState(const NetworkState* network) {

bool behind_captive_portal = false;

- if (network) {

+ if (network && NetworkPortalDetector::IsInitialized()) {

NetworkPortalDetector::CaptivePortalState state =

NetworkPortalDetector::Get()->GetCaptivePortalState(network->guid());

behind_captive_portal =