| 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/metrics/user_metrics_recorder.h" | 8 #include "ash/metrics/user_metrics_recorder.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/chromeos/network/network_icon_animation.h" | 10 #include "ash/system/chromeos/network/network_icon_animation.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 #include "ui/views/controls/link_listener.h" | 33 #include "ui/views/controls/link_listener.h" |
| 34 #include "ui/views/layout/box_layout.h" | 34 #include "ui/views/layout/box_layout.h" |
| 35 #include "ui/views/widget/widget.h" | 35 #include "ui/views/widget/widget.h" |
| 36 | 36 |
| 37 using chromeos::NetworkHandler; | 37 using chromeos::NetworkHandler; |
| 38 using chromeos::NetworkState; | 38 using chromeos::NetworkState; |
| 39 using chromeos::NetworkStateHandler; | 39 using chromeos::NetworkStateHandler; |
| 40 using chromeos::NetworkTypePattern; | 40 using chromeos::NetworkTypePattern; |
| 41 | 41 |
| 42 namespace ash { | 42 namespace ash { |
| 43 namespace internal { | |
| 44 | |
| 45 namespace tray { | 43 namespace tray { |
| 46 | 44 |
| 47 class NetworkTrayView : public TrayItemView, | 45 class NetworkTrayView : public TrayItemView, |
| 48 public network_icon::AnimationObserver { | 46 public network_icon::AnimationObserver { |
| 49 public: | 47 public: |
| 50 explicit NetworkTrayView(TrayNetwork* network_tray) | 48 explicit NetworkTrayView(TrayNetwork* network_tray) |
| 51 : TrayItemView(network_tray), | 49 : TrayItemView(network_tray), |
| 52 network_tray_(network_tray) { | 50 network_tray_(network_tray) { |
| 53 SetLayoutManager( | 51 SetLayoutManager( |
| 54 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0)); | 52 new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0)); |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 else | 365 else |
| 368 detailed_->ManagerChanged(); | 366 detailed_->ManagerChanged(); |
| 369 } | 367 } |
| 370 } | 368 } |
| 371 | 369 |
| 372 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) { | 370 void TrayNetwork::NetworkServiceChanged(const chromeos::NetworkState* network) { |
| 373 if (detailed_) | 371 if (detailed_) |
| 374 detailed_->NetworkServiceChanged(network); | 372 detailed_->NetworkServiceChanged(network); |
| 375 } | 373 } |
| 376 | 374 |
| 377 } // namespace internal | |
| 378 } // namespace ash | 375 } // namespace ash |
| OLD | NEW |