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/common/shelf/wm_shelf_util.h" | 8 #include "ash/common/shelf/wm_shelf_util.h" |
9 #include "ash/metrics/user_metrics_recorder.h" | 9 #include "ash/metrics/user_metrics_recorder.h" |
10 #include "ash/shelf/shelf_util.h" | 10 #include "ash/shelf/shelf_util.h" |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" | 12 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" |
13 #include "ash/system/chromeos/network/tray_network_state_observer.h" | 13 #include "ash/system/chromeos/network/tray_network_state_observer.h" |
14 #include "ash/system/tray/system_tray.h" | 14 #include "ash/system/tray/system_tray.h" |
15 #include "ash/system/tray/system_tray_delegate.h" | 15 #include "ash/system/tray/system_tray_delegate.h" |
16 #include "ash/system/tray/system_tray_notifier.h" | 16 #include "ash/system/tray/system_tray_notifier.h" |
17 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
18 #include "ash/system/tray/tray_item_more.h" | 18 #include "ash/system/tray/tray_item_more.h" |
19 #include "ash/system/tray/tray_item_view.h" | 19 #include "ash/system/tray/tray_item_view.h" |
20 #include "ash/system/tray/tray_utils.h" | 20 #include "ash/system/tray/tray_utils.h" |
21 #include "base/command_line.h" | 21 #include "base/command_line.h" |
22 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
23 #include "chromeos/network/network_state.h" | 23 #include "chromeos/network/network_state.h" |
24 #include "chromeos/network/network_state_handler.h" | 24 #include "chromeos/network/network_state_handler.h" |
25 #include "grit/ash_resources.h" | 25 #include "grit/ash_resources.h" |
26 #include "grit/ash_strings.h" | 26 #include "grit/ash_strings.h" |
27 #include "grit/ui_chromeos_strings.h" | 27 #include "grit/ui_chromeos_strings.h" |
28 #include "third_party/cros_system_api/dbus/service_constants.h" | 28 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 29 #include "ui/accessibility/ax_enums.h" |
29 #include "ui/accessibility/ax_view_state.h" | 30 #include "ui/accessibility/ax_view_state.h" |
30 #include "ui/base/l10n/l10n_util.h" | 31 #include "ui/base/l10n/l10n_util.h" |
31 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/chromeos/network/network_icon.h" | 33 #include "ui/chromeos/network/network_icon.h" |
33 #include "ui/chromeos/network/network_icon_animation.h" | 34 #include "ui/chromeos/network/network_icon_animation.h" |
34 #include "ui/chromeos/network/network_icon_animation_observer.h" | 35 #include "ui/chromeos/network/network_icon_animation_observer.h" |
35 #include "ui/views/controls/image_view.h" | 36 #include "ui/views/controls/image_view.h" |
36 #include "ui/views/controls/link.h" | 37 #include "ui/views/controls/link.h" |
37 #include "ui/views/controls/link_listener.h" | 38 #include "ui/views/controls/link_listener.h" |
38 #include "ui/views/layout/box_layout.h" | 39 #include "ui/views/layout/box_layout.h" |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 void TrayNetwork::NetworkStateChanged() { | 334 void TrayNetwork::NetworkStateChanged() { |
334 if (tray_) | 335 if (tray_) |
335 tray_->UpdateNetworkStateHandlerIcon(); | 336 tray_->UpdateNetworkStateHandlerIcon(); |
336 if (default_) | 337 if (default_) |
337 default_->Update(); | 338 default_->Update(); |
338 if (detailed_) | 339 if (detailed_) |
339 detailed_->Update(); | 340 detailed_->Update(); |
340 } | 341 } |
341 | 342 |
342 } // namespace ash | 343 } // namespace ash |
OLD | NEW |