chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc - Issue 865813005: Fix network portal detector crash on shutdown

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/extensions/api/networking_private/networking_private_chromeos.cc

Issue 865813005: Fix network portal detector crash on shutdown (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/net/network_portal_detector_impl.cc ('k') | chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc

index 38ee102d4683f4d5165b412c3d6190235dbd34f7..2bcc246a3b42b6680b331269ef30f9a7916b5e1d 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc

@@ -283,15 +283,13 @@ void NetworkingPrivateChromeOS::GetCaptivePortalStatus(

const std::string& guid,

const StringCallback& success_callback,

const FailureCallback& failure_callback) {

- chromeos::NetworkPortalDetector* detector =

- chromeos::NetworkPortalDetector::Get();

- if (!detector) {

+ if (!chromeos::NetworkPortalDetector::IsInitialized()) {

failure_callback.Run(networking_private::kErrorNotReady);

return;

}

chromeos::NetworkPortalDetector::CaptivePortalState state =

- detector->GetCaptivePortalState(guid);

+ chromeos::NetworkPortalDetector::Get()->GetCaptivePortalState(guid);

success_callback.Run(

chromeos::NetworkPortalDetector::CaptivePortalStatusString(state.status));

}