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.h" | 5 #include "ash/system/chromeos/network/tray_network.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/system/chromeos/network/network_icon_animation.h" | 9 #include "ash/system/chromeos/network/network_icon_animation.h" |
10 #include "ash/system/chromeos/network/network_list_detailed_view.h" | 10 #include "ash/system/chromeos/network/network_list_detailed_view.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 GetMostRelevantNetworkIcon(&info, false); | 124 GetMostRelevantNetworkIcon(&info, false); |
125 UpdateIcon(info.tray_icon_visible, info.image); | 125 UpdateIcon(info.tray_icon_visible, info.image); |
126 } | 126 } |
127 } | 127 } |
128 | 128 |
129 virtual ~NetworkTrayView() { | 129 virtual ~NetworkTrayView() { |
130 if (UseNewNetworkHandlers()) | 130 if (UseNewNetworkHandlers()) |
131 network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); | 131 network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); |
132 } | 132 } |
133 | 133 |
134 std::string GetClassName() const { return "NetworkTrayView"; } | 134 virtual std::string GetClassName() const OVERRIDE { |
| 135 return "NetworkTrayView"; |
| 136 } |
135 | 137 |
136 void Update(const NetworkIconInfo& info) { | 138 void Update(const NetworkIconInfo& info) { |
137 if (UseNewNetworkHandlers()) | 139 if (UseNewNetworkHandlers()) |
138 return; | 140 return; |
139 UpdateIcon(info.tray_icon_visible, info.image); | 141 UpdateIcon(info.tray_icon_visible, info.image); |
140 UpdateConnectionStatus(info.name, info.connected); | 142 UpdateConnectionStatus(info.name, info.connected); |
141 } | 143 } |
142 | 144 |
143 void UpdateNetworkStateHandlerIcon() { | 145 void UpdateNetworkStateHandlerIcon() { |
144 DCHECK(UseNewNetworkHandlers()); | 146 DCHECK(UseNewNetworkHandlers()); |
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
636 | 638 |
637 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) { | 639 void TrayNetwork::LinkClicked(MessageType message_type, int link_id) { |
638 tray::NetworkMessages::MessageMap::const_iterator iter = | 640 tray::NetworkMessages::MessageMap::const_iterator iter = |
639 messages()->messages().find(message_type); | 641 messages()->messages().find(message_type); |
640 if (iter != messages()->messages().end() && iter->second.delegate) | 642 if (iter != messages()->messages().end() && iter->second.delegate) |
641 iter->second.delegate->NotificationLinkClicked(message_type, link_id); | 643 iter->second.delegate->NotificationLinkClicked(message_type, link_id); |
642 } | 644 } |
643 | 645 |
644 } // namespace internal | 646 } // namespace internal |
645 } // namespace ash | 647 } // namespace ash |
OLD | NEW |