Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(359)

Unified Diff: chrome/browser/extensions/api/networking_private/networking_private_event_router_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/extensions/api/networking_private/networking_private_chromeos.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
index 5694c7e3ab8f2c8cd5efb45ff053c940ec619ece..b827f165883dd532e1fadd3ac8bce3db3534393a 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_chromeos.cc
@@ -132,11 +132,13 @@ void NetworkingPrivateEventRouterImpl::StartOrStopListeningForNetworkChanges() {
if (should_listen && !listening_) {
NetworkHandler::Get()->network_state_handler()->AddObserver(
this, FROM_HERE);
- NetworkPortalDetector::Get()->AddObserver(this);
+ if (chromeos::NetworkPortalDetector::IsInitialized())
+ NetworkPortalDetector::Get()->AddObserver(this);
} else if (!should_listen && listening_) {
NetworkHandler::Get()->network_state_handler()->RemoveObserver(
this, FROM_HERE);
- NetworkPortalDetector::Get()->RemoveObserver(this);
+ if (chromeos::NetworkPortalDetector::IsInitialized())
+ NetworkPortalDetector::Get()->RemoveObserver(this);
}
listening_ = should_listen;
}
« no previous file with comments | « chrome/browser/extensions/api/networking_private/networking_private_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698