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

Unified Diff: ash/system/chromeos/network/tray_network_state_observer.cc

Issue 15350002: Deprecate kAshDisableNewNetworkStatusArea (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 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 | « ash/system/chromeos/network/tray_network.cc ('k') | ash/system/chromeos/network/tray_sms.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « ash/system/chromeos/network/tray_network.cc ('k') | ash/system/chromeos/network/tray_sms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698