| 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/common/system/chromeos/network/tray_network.h" | 5 #include "ash/common/system/chromeos/network/tray_network.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_switches.h" | 7 #include "ash/common/ash_switches.h" |
| 8 #include "ash/common/shelf/wm_shelf_util.h" | 8 #include "ash/common/shelf/wm_shelf_util.h" |
| 9 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h" | 9 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h" |
| 10 #include "ash/common/system/chromeos/network/tray_network_state_observer.h" | 10 #include "ash/common/system/chromeos/network/tray_network_state_observer.h" |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 private: | 228 private: |
| 229 views::ImageView* image_view_; | 229 views::ImageView* image_view_; |
| 230 views::Label* label_view_; | 230 views::Label* label_view_; |
| 231 | 231 |
| 232 DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView); | 232 DISALLOW_COPY_AND_ASSIGN(NetworkWifiDetailedView); |
| 233 }; | 233 }; |
| 234 | 234 |
| 235 } // namespace tray | 235 } // namespace tray |
| 236 | 236 |
| 237 TrayNetwork::TrayNetwork(SystemTray* system_tray) | 237 TrayNetwork::TrayNetwork(SystemTray* system_tray) |
| 238 : SystemTrayItem(system_tray), | 238 : SystemTrayItem(system_tray, UMA_NETWORK), |
| 239 tray_(NULL), | 239 tray_(NULL), |
| 240 default_(NULL), | 240 default_(NULL), |
| 241 detailed_(NULL), | 241 detailed_(NULL), |
| 242 request_wifi_view_(false) { | 242 request_wifi_view_(false) { |
| 243 network_state_observer_.reset(new TrayNetworkStateObserver(this)); | 243 network_state_observer_.reset(new TrayNetworkStateObserver(this)); |
| 244 SystemTrayNotifier* notifier = WmShell::Get()->system_tray_notifier(); | 244 SystemTrayNotifier* notifier = WmShell::Get()->system_tray_notifier(); |
| 245 notifier->AddNetworkObserver(this); | 245 notifier->AddNetworkObserver(this); |
| 246 notifier->AddNetworkPortalDetectorObserver(this); | 246 notifier->AddNetworkPortalDetectorObserver(this); |
| 247 } | 247 } |
| 248 | 248 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 void TrayNetwork::NetworkStateChanged() { | 330 void TrayNetwork::NetworkStateChanged() { |
| 331 if (tray_) | 331 if (tray_) |
| 332 tray_->UpdateNetworkStateHandlerIcon(); | 332 tray_->UpdateNetworkStateHandlerIcon(); |
| 333 if (default_) | 333 if (default_) |
| 334 default_->Update(); | 334 default_->Update(); |
| 335 if (detailed_) | 335 if (detailed_) |
| 336 detailed_->Update(); | 336 detailed_->Update(); |
| 337 } | 337 } |
| 338 | 338 |
| 339 } // namespace ash | 339 } // namespace ash |
| OLD | NEW |