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/network/network_state_list_detailed_view.h" | 5 #include "ash/system/network/network_state_list_detailed_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/ash_constants.h" | 10 #include "ash/ash_constants.h" |
11 #include "ash/common/material_design/material_design_controller.h" | 11 #include "ash/material_design/material_design_controller.h" |
12 #include "ash/common/wm_shell.h" | |
13 #include "ash/common/wm_window.h" | |
14 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
15 #include "ash/resources/grit/ash_resources.h" | 13 #include "ash/resources/grit/ash_resources.h" |
16 #include "ash/root_window_controller.h" | 14 #include "ash/root_window_controller.h" |
17 #include "ash/strings/grit/ash_strings.h" | 15 #include "ash/strings/grit/ash_strings.h" |
18 #include "ash/system/network/network_icon.h" | 16 #include "ash/system/network/network_icon.h" |
19 #include "ash/system/network/network_icon_animation.h" | 17 #include "ash/system/network/network_icon_animation.h" |
20 #include "ash/system/network/network_info.h" | 18 #include "ash/system/network/network_info.h" |
21 #include "ash/system/network/network_list.h" | 19 #include "ash/system/network/network_list.h" |
22 #include "ash/system/network/network_list_md.h" | 20 #include "ash/system/network/network_list_md.h" |
23 #include "ash/system/network/network_list_view_base.h" | 21 #include "ash/system/network/network_list_view_base.h" |
24 #include "ash/system/network/tray_network_state_observer.h" | 22 #include "ash/system/network/tray_network_state_observer.h" |
25 #include "ash/system/network/vpn_list_view.h" | 23 #include "ash/system/network/vpn_list_view.h" |
26 #include "ash/system/networking_config_delegate.h" | 24 #include "ash/system/networking_config_delegate.h" |
27 #include "ash/system/tray/fixed_sized_image_view.h" | 25 #include "ash/system/tray/fixed_sized_image_view.h" |
28 #include "ash/system/tray/hover_highlight_view.h" | 26 #include "ash/system/tray/hover_highlight_view.h" |
29 #include "ash/system/tray/system_menu_button.h" | 27 #include "ash/system/tray/system_menu_button.h" |
30 #include "ash/system/tray/system_tray.h" | 28 #include "ash/system/tray/system_tray.h" |
31 #include "ash/system/tray/system_tray_controller.h" | 29 #include "ash/system/tray/system_tray_controller.h" |
32 #include "ash/system/tray/system_tray_delegate.h" | 30 #include "ash/system/tray/system_tray_delegate.h" |
33 #include "ash/system/tray/throbber_view.h" | 31 #include "ash/system/tray/throbber_view.h" |
34 #include "ash/system/tray/tray_constants.h" | 32 #include "ash/system/tray/tray_constants.h" |
35 #include "ash/system/tray/tray_details_view.h" | 33 #include "ash/system/tray/tray_details_view.h" |
36 #include "ash/system/tray/tray_popup_header_button.h" | 34 #include "ash/system/tray/tray_popup_header_button.h" |
37 #include "ash/system/tray/tri_view.h" | 35 #include "ash/system/tray/tri_view.h" |
| 36 #include "ash/wm_shell.h" |
| 37 #include "ash/wm_window.h" |
38 #include "base/command_line.h" | 38 #include "base/command_line.h" |
39 #include "base/strings/string_number_conversions.h" | 39 #include "base/strings/string_number_conversions.h" |
40 #include "base/strings/utf_string_conversions.h" | 40 #include "base/strings/utf_string_conversions.h" |
41 #include "base/threading/thread_task_runner_handle.h" | 41 #include "base/threading/thread_task_runner_handle.h" |
42 #include "base/time/time.h" | 42 #include "base/time/time.h" |
43 #include "chromeos/chromeos_switches.h" | 43 #include "chromeos/chromeos_switches.h" |
44 #include "chromeos/login/login_state.h" | 44 #include "chromeos/login/login_state.h" |
45 #include "chromeos/network/device_state.h" | 45 #include "chromeos/network/device_state.h" |
46 #include "chromeos/network/managed_network_configuration_handler.h" | 46 #include "chromeos/network/managed_network_configuration_handler.h" |
47 #include "chromeos/network/network_connect.h" | 47 #include "chromeos/network/network_connect.h" |
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
749 UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED); | 749 UMA_STATUS_AREA_NETWORK_JOIN_OTHER_CLICKED); |
750 WmShell::Get()->system_tray_controller()->ShowNetworkCreate(shill::kTypeWifi); | 750 WmShell::Get()->system_tray_controller()->ShowNetworkCreate(shill::kTypeWifi); |
751 } | 751 } |
752 | 752 |
753 void NetworkStateListDetailedView::RelayoutScrollList() { | 753 void NetworkStateListDetailedView::RelayoutScrollList() { |
754 scroller()->Layout(); | 754 scroller()->Layout(); |
755 } | 755 } |
756 | 756 |
757 } // namespace tray | 757 } // namespace tray |
758 } // namespace ash | 758 } // namespace ash |
OLD | NEW |