| 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_vpn.h" | 5 #include "ash/system/chromeos/network/tray_vpn.h" |
| 6 | 6 |
| 7 #include "ash/metrics/user_metrics_recorder.h" | 7 #include "ash/metrics/user_metrics_recorder.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_state_list_detailed_view.h" | 10 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" |
| 11 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
| 12 #include "ash/system/tray/system_tray_delegate.h" | 12 #include "ash/system/tray/system_tray_delegate.h" |
| 13 #include "ash/system/tray/tray_constants.h" | 13 #include "ash/system/tray/tray_constants.h" |
| 14 #include "ash/system/tray/tray_item_more.h" | 14 #include "ash/system/tray/tray_item_more.h" |
| 15 #include "ash/system/tray/tray_popup_label_button.h" | 15 #include "ash/system/tray/tray_popup_label_button.h" |
| 16 #include "chromeos/network/network_state.h" | 16 #include "chromeos/network/network_state.h" |
| 17 #include "chromeos/network/network_state_handler.h" | 17 #include "chromeos/network/network_state_handler.h" |
| 18 #include "chromeos/network/shill_property_util.h" | 18 #include "chromeos/network/shill_property_util.h" |
| 19 #include "grit/ash_strings.h" | 19 #include "grit/ash_strings.h" |
| 20 #include "third_party/cros_system_api/dbus/service_constants.h" | 20 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 | 23 |
| 24 using chromeos::NetworkHandler; | 24 using chromeos::NetworkHandler; |
| 25 using chromeos::NetworkState; | 25 using chromeos::NetworkState; |
| 26 using chromeos::NetworkStateHandler; | 26 using chromeos::NetworkStateHandler; |
| 27 using chromeos::NetworkTypePattern; | 27 using chromeos::NetworkTypePattern; |
| 28 | 28 |
| 29 namespace ash { | 29 namespace ash { |
| 30 namespace internal { | |
| 31 | |
| 32 namespace tray { | 30 namespace tray { |
| 33 | 31 |
| 34 class VpnDefaultView : public TrayItemMore, | 32 class VpnDefaultView : public TrayItemMore, |
| 35 public network_icon::AnimationObserver { | 33 public network_icon::AnimationObserver { |
| 36 public: | 34 public: |
| 37 VpnDefaultView(SystemTrayItem* owner, bool show_more) | 35 VpnDefaultView(SystemTrayItem* owner, bool show_more) |
| 38 : TrayItemMore(owner, show_more) { | 36 : TrayItemMore(owner, show_more) { |
| 39 Update(); | 37 Update(); |
| 40 } | 38 } |
| 41 | 39 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 else | 167 else |
| 170 detailed_->ManagerChanged(); | 168 detailed_->ManagerChanged(); |
| 171 } | 169 } |
| 172 } | 170 } |
| 173 | 171 |
| 174 void TrayVPN::NetworkServiceChanged(const chromeos::NetworkState* network) { | 172 void TrayVPN::NetworkServiceChanged(const chromeos::NetworkState* network) { |
| 175 if (detailed_) | 173 if (detailed_) |
| 176 detailed_->NetworkServiceChanged(network); | 174 detailed_->NetworkServiceChanged(network); |
| 177 } | 175 } |
| 178 | 176 |
| 179 } // namespace internal | |
| 180 } // namespace ash | 177 } // namespace ash |
| OLD | NEW |