diff options
Diffstat (limited to 'chrome/browser/chromeos/network_state_notifier.cc')
| -rw-r--r-- | chrome/browser/chromeos/network_state_notifier.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/network_state_notifier.cc b/chrome/browser/chromeos/network_state_notifier.cc index 5e23247..80acfaf 100644 --- a/chrome/browser/chromeos/network_state_notifier.cc +++ b/chrome/browser/chromeos/network_state_notifier.cc @@ -34,9 +34,19 @@ NetworkStateNotifier::NetworkStateNotifier() : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)), state_(RetrieveState()), offline_start_time_(Time::Now()) { + // Note that this gets added as a NetworkManagerObserver + // in browser_init.cc } -void NetworkStateNotifier::NetworkChanged(NetworkLibrary* cros) { +NetworkStateNotifier::~NetworkStateNotifier() { + // Let the NetworkManagerObserver leak to avoid a DCHECK + // failure in CommandLine::ForCurrentProcess. +// if (CrosLibrary::Get()->EnsureLoaded()) +// CrosLibrary::Get()->GetNetworkLibrary()-> +// RemoveNetworkManagerObserver(this); +} + +void NetworkStateNotifier::OnNetworkManagerChanged(NetworkLibrary* cros) { DCHECK(CrosLibrary::Get()->EnsureLoaded()); BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, @@ -47,8 +57,7 @@ void NetworkStateNotifier::NetworkChanged(NetworkLibrary* cros) { void NetworkStateNotifier::UpdateNetworkState( NetworkStateDetails::State new_state) { - DLOG(INFO) << "UpdateNetworkState: new=" - << new_state << ", old=" << state_; + DVLOG(1) << "UpdateNetworkState: new=" << new_state << ", old=" << state_; if (state_ == NetworkStateDetails::CONNECTED && new_state != NetworkStateDetails::CONNECTED) { offline_start_time_ = Time::Now(); |