| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/chromeos/network/tray_network_state_observer.h" | 5 #include "ash/system/chromeos/network/tray_network_state_observer.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "chromeos/network/network_state.h" | 10 #include "chromeos/network/network_state.h" |
| 11 #include "chromeos/network/network_state_handler.h" | 11 #include "chromeos/network/network_state_handler.h" |
| 12 #include "third_party/cros_system_api/dbus/service_constants.h" | 12 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 13 | 13 |
| 14 using chromeos::NetworkHandler; |
| 15 |
| 14 namespace ash { | 16 namespace ash { |
| 15 namespace internal { | 17 namespace internal { |
| 16 | 18 |
| 17 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) | 19 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) |
| 18 : delegate_(delegate) { | 20 : delegate_(delegate) { |
| 19 chromeos::NetworkStateHandler::Get()->AddObserver(this); | 21 NetworkHandler::Get()->network_state_handler()->AddObserver(this); |
| 20 } | 22 } |
| 21 | 23 |
| 22 TrayNetworkStateObserver::~TrayNetworkStateObserver() { | 24 TrayNetworkStateObserver::~TrayNetworkStateObserver() { |
| 23 chromeos::NetworkStateHandler::Get()->RemoveObserver(this); | 25 NetworkHandler::Get()->network_state_handler()->RemoveObserver(this); |
| 24 } | 26 } |
| 25 | 27 |
| 26 void TrayNetworkStateObserver::NetworkManagerChanged() { | 28 void TrayNetworkStateObserver::NetworkManagerChanged() { |
| 27 delegate_->NetworkStateChanged(false); | 29 delegate_->NetworkStateChanged(false); |
| 28 } | 30 } |
| 29 | 31 |
| 30 void TrayNetworkStateObserver::NetworkListChanged() { | 32 void TrayNetworkStateObserver::NetworkListChanged() { |
| 31 delegate_->NetworkStateChanged(true); | 33 delegate_->NetworkStateChanged(true); |
| 32 } | 34 } |
| 33 | 35 |
| 34 void TrayNetworkStateObserver::DeviceListChanged() { | 36 void TrayNetworkStateObserver::DeviceListChanged() { |
| 35 delegate_->NetworkStateChanged(false); | 37 delegate_->NetworkStateChanged(false); |
| 36 } | 38 } |
| 37 | 39 |
| 38 void TrayNetworkStateObserver::DefaultNetworkChanged( | 40 void TrayNetworkStateObserver::DefaultNetworkChanged( |
| 39 const chromeos::NetworkState* network) { | 41 const chromeos::NetworkState* network) { |
| 40 delegate_->NetworkStateChanged(true); | 42 delegate_->NetworkStateChanged(true); |
| 41 } | 43 } |
| 42 | 44 |
| 43 void TrayNetworkStateObserver::NetworkPropertiesUpdated( | 45 void TrayNetworkStateObserver::NetworkPropertiesUpdated( |
| 44 const chromeos::NetworkState* network) { | 46 const chromeos::NetworkState* network) { |
| 45 if (network == chromeos::NetworkStateHandler::Get()->DefaultNetwork()) | 47 if (network == |
| 48 NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) |
| 46 delegate_->NetworkStateChanged(true); | 49 delegate_->NetworkStateChanged(true); |
| 47 delegate_->NetworkServiceChanged(network); | 50 delegate_->NetworkServiceChanged(network); |
| 48 } | 51 } |
| 49 | 52 |
| 50 } // namespace ash | 53 } // namespace ash |
| 51 } // namespace internal | 54 } // namespace internal |
| OLD | NEW |