Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/shell.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:
View unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 11 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
12 #include "ash/accelerators/accelerator_delegate.h" 12 #include "ash/accelerators/accelerator_delegate.h"
13 #include "ash/aura/wm_shell_aura.h" 13 #include "ash/aura/wm_shell_aura.h"
14 #include "ash/aura/wm_window_aura.h" 14 #include "ash/aura/wm_window_aura.h"
15 #include "ash/autoclick/autoclick_controller.h" 15 #include "ash/autoclick/autoclick_controller.h"
16 #include "ash/common/accelerators/accelerator_controller.h" 16 #include "ash/common/accelerators/accelerator_controller.h"
17 #include "ash/common/frame/custom_frame_view_ash.h" 17 #include "ash/common/frame/custom_frame_view_ash.h"
18 #include "ash/common/gpu_support.h" 18 #include "ash/common/gpu_support.h"
19 #include "ash/common/keyboard/keyboard_ui.h" 19 #include "ash/common/keyboard/keyboard_ui.h"
20 #include "ash/common/login_status.h" 20 #include "ash/common/login_status.h"
21 #include "ash/common/session/session_state_delegate.h" 21 #include "ash/common/session/session_state_delegate.h"
22 #include "ash/common/shelf/app_list_shelf_item_delegate.h" 22 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
23 #include "ash/common/shelf/shelf_delegate.h" 23 #include "ash/common/shelf/shelf_delegate.h"
24 #include "ash/common/shelf/shelf_item_delegate.h" 24 #include "ash/common/shelf/shelf_item_delegate.h"
25 #include "ash/common/shelf/shelf_model.h" 25 #include "ash/common/shelf/shelf_model.h"
26 #include "ash/common/shelf/wm_shelf.h" 26 #include "ash/common/shelf/wm_shelf.h"
27 #include "ash/common/shell_delegate.h" 27 #include "ash/common/shell_delegate.h"
28 #include "ash/common/shell_window_ids.h"
29 #include "ash/common/system/status_area_widget.h" 28 #include "ash/common/system/status_area_widget.h"
30 #include "ash/common/system/tray/system_tray_delegate.h" 29 #include "ash/common/system/tray/system_tray_delegate.h"
31 #include "ash/common/wallpaper/wallpaper_delegate.h" 30 #include "ash/common/wallpaper/wallpaper_delegate.h"
32 #include "ash/common/wm/container_finder.h" 31 #include "ash/common/wm/container_finder.h"
33 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 32 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
34 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" 33 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
35 #include "ash/common/wm/mru_window_tracker.h" 34 #include "ash/common/wm/mru_window_tracker.h"
36 #include "ash/common/wm/root_window_finder.h" 35 #include "ash/common/wm/root_window_finder.h"
37 #include "ash/common/wm/system_modal_container_layout_manager.h" 36 #include "ash/common/wm/system_modal_container_layout_manager.h"
38 #include "ash/common/wm/window_positioner.h" 37 #include "ash/common/wm/window_positioner.h"
39 #include "ash/common/wm/workspace_controller.h" 38 #include "ash/common/wm/workspace_controller.h"
40 #include "ash/common/wm_root_window_controller.h" 39 #include "ash/common/wm_root_window_controller.h"
41 #include "ash/common/wm_shell.h" 40 #include "ash/common/wm_shell.h"
42 #include "ash/display/cursor_window_controller.h" 41 #include "ash/display/cursor_window_controller.h"
43 #include "ash/display/display_configuration_controller.h" 42 #include "ash/display/display_configuration_controller.h"
44 #include "ash/display/display_manager.h" 43 #include "ash/display/display_manager.h"
45 #include "ash/display/event_transformation_handler.h" 44 #include "ash/display/event_transformation_handler.h"
46 #include "ash/display/mouse_cursor_event_filter.h" 45 #include "ash/display/mouse_cursor_event_filter.h"
47 #include "ash/display/screen_ash.h" 46 #include "ash/display/screen_ash.h"
48 #include "ash/display/screen_position_controller.h" 47 #include "ash/display/screen_position_controller.h"
49 #include "ash/display/window_tree_host_manager.h" 48 #include "ash/display/window_tree_host_manager.h"
50 #include "ash/drag_drop/drag_drop_controller.h" 49 #include "ash/drag_drop/drag_drop_controller.h"
51 #include "ash/first_run/first_run_helper_impl.h" 50 #include "ash/first_run/first_run_helper_impl.h"
52 #include "ash/high_contrast/high_contrast_controller.h" 51 #include "ash/high_contrast/high_contrast_controller.h"
53 #include "ash/host/ash_window_tree_host_init_params.h" 52 #include "ash/host/ash_window_tree_host_init_params.h"
54 #include "ash/ime/input_method_event_handler.h" 53 #include "ash/ime/input_method_event_handler.h"
55 #include "ash/laser/laser_pointer_controller.h" 54 #include "ash/laser/laser_pointer_controller.h"
56 #include "ash/magnifier/magnification_controller.h" 55 #include "ash/magnifier/magnification_controller.h"
57 #include "ash/magnifier/partial_magnification_controller.h" 56 #include "ash/magnifier/partial_magnification_controller.h"
57 #include "ash/public/cpp/shell_window_ids.h"
58 #include "ash/root_window_controller.h" 58 #include "ash/root_window_controller.h"
59 #include "ash/shell_init_params.h" 59 #include "ash/shell_init_params.h"
60 #include "ash/system/chromeos/screen_layout_observer.h" 60 #include "ash/system/chromeos/screen_layout_observer.h"
61 #include "ash/utility/screenshot_controller.h" 61 #include "ash/utility/screenshot_controller.h"
62 #include "ash/wm/ash_focus_rules.h" 62 #include "ash/wm/ash_focus_rules.h"
63 #include "ash/wm/ash_native_cursor_manager.h" 63 #include "ash/wm/ash_native_cursor_manager.h"
64 #include "ash/wm/event_client_impl.h" 64 #include "ash/wm/event_client_impl.h"
65 #include "ash/wm/immersive_handler_factory_ash.h" 65 #include "ash/wm/immersive_handler_factory_ash.h"
66 #include "ash/wm/lock_state_controller.h" 66 #include "ash/wm/lock_state_controller.h"
67 #include "ash/wm/overlay_event_filter.h" 67 #include "ash/wm/overlay_event_filter.h"
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
892 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 892 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
893 return std::unique_ptr<ui::EventTargetIterator>(); 893 return std::unique_ptr<ui::EventTargetIterator>();
894 } 894 }
895 895
896 ui::EventTargeter* Shell::GetEventTargeter() { 896 ui::EventTargeter* Shell::GetEventTargeter() {
897 NOTREACHED(); 897 NOTREACHED();
898 return nullptr; 898 return nullptr;
899 } 899 }
900 900
901 } // namespace ash 901 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_view_unittest.cc ('k') | ash/shell/lock_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698