ash/common/system/chromeos/network/network_state_list_detailed_view.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

Side by Side Diff: ash/common/system/chromeos/network/network_state_list_detailed_view.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: rebase Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »

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/network_state_list_detailed_view.h"	5 #include "ash/common/system/chromeos/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/common/ash_constants.h"

11 #include "ash/common/material_design/material_design_controller.h"	11 #include "ash/common/material_design/material_design_controller.h"

12 #include "ash/common/shell_window_ids.h"

13 #include "ash/common/system/chromeos/network/tray_network_state_observer.h"	12 #include "ash/common/system/chromeos/network/tray_network_state_observer.h"

14 #include "ash/common/system/chromeos/network/vpn_list_view.h"	13 #include "ash/common/system/chromeos/network/vpn_list_view.h"

15 #include "ash/common/system/networking_config_delegate.h"	14 #include "ash/common/system/networking_config_delegate.h"

16 #include "ash/common/system/tray/fixed_sized_image_view.h"	15 #include "ash/common/system/tray/fixed_sized_image_view.h"

17 #include "ash/common/system/tray/fixed_sized_scroll_view.h"	16 #include "ash/common/system/tray/fixed_sized_scroll_view.h"

18 #include "ash/common/system/tray/hover_highlight_view.h"	17 #include "ash/common/system/tray/hover_highlight_view.h"

19 #include "ash/common/system/tray/system_tray.h"	18 #include "ash/common/system/tray/system_tray.h"

20 #include "ash/common/system/tray/system_tray_controller.h"	19 #include "ash/common/system/tray/system_tray_controller.h"

21 #include "ash/common/system/tray/system_tray_delegate.h"	20 #include "ash/common/system/tray/system_tray_delegate.h"

22 #include "ash/common/system/tray/throbber_view.h"	21 #include "ash/common/system/tray/throbber_view.h"

23 #include "ash/common/system/tray/tray_constants.h"	22 #include "ash/common/system/tray/tray_constants.h"

24 #include "ash/common/system/tray/tray_details_view.h"	23 #include "ash/common/system/tray/tray_details_view.h"

25 #include "ash/common/system/tray/tray_popup_header_button.h"	24 #include "ash/common/system/tray/tray_popup_header_button.h"

26 #include "ash/common/system/tray/tray_popup_label_button.h"	25 #include "ash/common/system/tray/tray_popup_label_button.h"

27 #include "ash/common/wm_lookup.h"	26 #include "ash/common/wm_lookup.h"

28 #include "ash/common/wm_root_window_controller.h"	27 #include "ash/common/wm_root_window_controller.h"

29 #include "ash/common/wm_shell.h"	28 #include "ash/common/wm_shell.h"

30 #include "ash/common/wm_window.h"	29 #include "ash/common/wm_window.h"

	30 #include "ash/public/cpp/shell_window_ids.h"

31 #include "base/command_line.h"	31 #include "base/command_line.h"

32 #include "base/strings/string_number_conversions.h"	32 #include "base/strings/string_number_conversions.h"

33 #include "base/strings/utf_string_conversions.h"	33 #include "base/strings/utf_string_conversions.h"

34 #include "base/threading/thread_task_runner_handle.h"	34 #include "base/threading/thread_task_runner_handle.h"

35 #include "base/time/time.h"	35 #include "base/time/time.h"

36 #include "chromeos/chromeos_switches.h"	36 #include "chromeos/chromeos_switches.h"

37 #include "chromeos/login/login_state.h"	37 #include "chromeos/login/login_state.h"

38 #include "chromeos/network/device_state.h"	38 #include "chromeos/network/device_state.h"

39 #include "chromeos/network/managed_network_configuration_handler.h"	39 #include "chromeos/network/managed_network_configuration_handler.h"

40 #include "chromeos/network/network_state.h"	40 #include "chromeos/network/network_state.h"

(...skipping 908 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
949 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();	949 SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();

950 delegate->ShowOtherNetworkDialog(shill::kTypeWifi);	950 delegate->ShowOtherNetworkDialog(shill::kTypeWifi);

951 }	951 }

952	952

953 void NetworkStateListDetailedView::RelayoutScrollList() {	953 void NetworkStateListDetailedView::RelayoutScrollList() {

954 scroller()->Layout();	954 scroller()->Layout();

955 }	955 }

956	956

957 } // namespace tray	957 } // namespace tray

958 } // namespace ash	958 } // namespace ash

OLD	NEW