Index: ash/system/chromeos/network/tray_network_state_observer.cc |
diff --git a/ash/system/chromeos/network/tray_network_state_observer.cc b/ash/system/chromeos/network/tray_network_state_observer.cc |
index d829a234117314cf94e2c22ecc84efb71abe9568..f1c6ed6d9f83bdefb23b72f72e8eee39a5f82ccb 100644 |
--- a/ash/system/chromeos/network/tray_network_state_observer.cc |
+++ b/ash/system/chromeos/network/tray_network_state_observer.cc |
@@ -16,11 +16,13 @@ namespace internal { |
TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) |
: delegate_(delegate) { |
- chromeos::NetworkStateHandler::Get()->AddObserver(this); |
+ if (chromeos::NetworkStateHandler::IsInitialized()) |
+ chromeos::NetworkStateHandler::Get()->AddObserver(this); |
} |
TrayNetworkStateObserver::~TrayNetworkStateObserver() { |
- chromeos::NetworkStateHandler::Get()->RemoveObserver(this); |
+ if (chromeos::NetworkStateHandler::IsInitialized()) |
+ chromeos::NetworkStateHandler::Get()->RemoveObserver(this); |
} |
void TrayNetworkStateObserver::NetworkManagerChanged() { |