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 "ash/system/chromeos/network/network_icon.h" | |
11 #include "base/location.h" | 10 #include "base/location.h" |
12 #include "chromeos/network/network_state.h" | 11 #include "chromeos/network/network_state.h" |
13 #include "chromeos/network/network_state_handler.h" | 12 #include "chromeos/network/network_state_handler.h" |
14 #include "third_party/cros_system_api/dbus/service_constants.h" | 13 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 14 #include "ui/chromeos/network/network_icon.h" |
15 | 15 |
16 using chromeos::NetworkHandler; | 16 using chromeos::NetworkHandler; |
17 | 17 |
18 namespace ash { | 18 namespace ash { |
19 | 19 |
20 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) | 20 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) |
21 : delegate_(delegate) { | 21 : delegate_(delegate) { |
22 if (NetworkHandler::IsInitialized()) { | 22 if (NetworkHandler::IsInitialized()) { |
23 NetworkHandler::Get()->network_state_handler()->AddObserver( | 23 NetworkHandler::Get()->network_state_handler()->AddObserver( |
24 this, FROM_HERE); | 24 this, FROM_HERE); |
25 } | 25 } |
26 } | 26 } |
27 | 27 |
28 TrayNetworkStateObserver::~TrayNetworkStateObserver() { | 28 TrayNetworkStateObserver::~TrayNetworkStateObserver() { |
29 if (NetworkHandler::IsInitialized()) { | 29 if (NetworkHandler::IsInitialized()) { |
30 NetworkHandler::Get()->network_state_handler()->RemoveObserver( | 30 NetworkHandler::Get()->network_state_handler()->RemoveObserver( |
31 this, FROM_HERE); | 31 this, FROM_HERE); |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 void TrayNetworkStateObserver::NetworkListChanged() { | 35 void TrayNetworkStateObserver::NetworkListChanged() { |
36 delegate_->NetworkStateChanged(true); | 36 delegate_->NetworkStateChanged(true); |
37 network_icon::PurgeNetworkIconCache(); | 37 ui::network_icon::PurgeNetworkIconCache(); |
38 } | 38 } |
39 | 39 |
40 void TrayNetworkStateObserver::DeviceListChanged() { | 40 void TrayNetworkStateObserver::DeviceListChanged() { |
41 delegate_->NetworkStateChanged(false); | 41 delegate_->NetworkStateChanged(false); |
42 } | 42 } |
43 | 43 |
44 // Any change to the Default (primary connected) network, including Strength | 44 // Any change to the Default (primary connected) network, including Strength |
45 // changes, should trigger a NetworkStateChanged update. | 45 // changes, should trigger a NetworkStateChanged update. |
46 void TrayNetworkStateObserver::DefaultNetworkChanged( | 46 void TrayNetworkStateObserver::DefaultNetworkChanged( |
47 const chromeos::NetworkState* network) { | 47 const chromeos::NetworkState* network) { |
(...skipping 16 matching lines...) Expand all Loading... |
64 if (network == | 64 if (network == |
65 NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) { | 65 NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) { |
66 // Trigger NetworkStateChanged in case the Strength property of the | 66 // Trigger NetworkStateChanged in case the Strength property of the |
67 // Default network changed. | 67 // Default network changed. |
68 delegate_->NetworkStateChanged(true); | 68 delegate_->NetworkStateChanged(true); |
69 } | 69 } |
70 delegate_->NetworkServiceChanged(network); | 70 delegate_->NetworkServiceChanged(network); |
71 } | 71 } |
72 | 72 |
73 } // namespace ash | 73 } // namespace ash |
OLD | NEW |