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

Side by Side Diff: ash/shell.cc

Issue 2445583002: Relocate display_manager from ash to ui (Closed)
Patch Set: fix windows build Created 4 years, 1 month 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/shell.h ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.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
(...skipping 22 matching lines...) Expand all
33 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" 33 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
34 #include "ash/common/wm/mru_window_tracker.h" 34 #include "ash/common/wm/mru_window_tracker.h"
35 #include "ash/common/wm/root_window_finder.h" 35 #include "ash/common/wm/root_window_finder.h"
36 #include "ash/common/wm/system_modal_container_layout_manager.h" 36 #include "ash/common/wm/system_modal_container_layout_manager.h"
37 #include "ash/common/wm/window_positioner.h" 37 #include "ash/common/wm/window_positioner.h"
38 #include "ash/common/wm/workspace_controller.h" 38 #include "ash/common/wm/workspace_controller.h"
39 #include "ash/common/wm_root_window_controller.h" 39 #include "ash/common/wm_root_window_controller.h"
40 #include "ash/common/wm_shell.h" 40 #include "ash/common/wm_shell.h"
41 #include "ash/display/cursor_window_controller.h" 41 #include "ash/display/cursor_window_controller.h"
42 #include "ash/display/display_configuration_controller.h" 42 #include "ash/display/display_configuration_controller.h"
43 #include "ash/display/display_manager.h"
44 #include "ash/display/event_transformation_handler.h" 43 #include "ash/display/event_transformation_handler.h"
45 #include "ash/display/mouse_cursor_event_filter.h" 44 #include "ash/display/mouse_cursor_event_filter.h"
46 #include "ash/display/screen_ash.h" 45 #include "ash/display/screen_ash.h"
47 #include "ash/display/screen_position_controller.h" 46 #include "ash/display/screen_position_controller.h"
48 #include "ash/display/window_tree_host_manager.h" 47 #include "ash/display/window_tree_host_manager.h"
49 #include "ash/drag_drop/drag_drop_controller.h" 48 #include "ash/drag_drop/drag_drop_controller.h"
50 #include "ash/first_run/first_run_helper_impl.h" 49 #include "ash/first_run/first_run_helper_impl.h"
51 #include "ash/high_contrast/high_contrast_controller.h" 50 #include "ash/high_contrast/high_contrast_controller.h"
52 #include "ash/host/ash_window_tree_host_init_params.h" 51 #include "ash/host/ash_window_tree_host_init_params.h"
53 #include "ash/ime/input_method_event_handler.h" 52 #include "ash/ime/input_method_event_handler.h"
(...skipping 29 matching lines...) Expand all
83 #include "ui/aura/client/aura_constants.h" 82 #include "ui/aura/client/aura_constants.h"
84 #include "ui/aura/env.h" 83 #include "ui/aura/env.h"
85 #include "ui/aura/layout_manager.h" 84 #include "ui/aura/layout_manager.h"
86 #include "ui/aura/window.h" 85 #include "ui/aura/window.h"
87 #include "ui/aura/window_event_dispatcher.h" 86 #include "ui/aura/window_event_dispatcher.h"
88 #include "ui/base/ui_base_switches.h" 87 #include "ui/base/ui_base_switches.h"
89 #include "ui/base/user_activity/user_activity_detector.h" 88 #include "ui/base/user_activity/user_activity_detector.h"
90 #include "ui/compositor/layer.h" 89 #include "ui/compositor/layer.h"
91 #include "ui/compositor/layer_animator.h" 90 #include "ui/compositor/layer_animator.h"
92 #include "ui/display/display.h" 91 #include "ui/display/display.h"
92 #include "ui/display/manager/display_manager.h"
93 #include "ui/display/screen.h" 93 #include "ui/display/screen.h"
94 #include "ui/events/event_target_iterator.h" 94 #include "ui/events/event_target_iterator.h"
95 #include "ui/gfx/geometry/size.h" 95 #include "ui/gfx/geometry/size.h"
96 #include "ui/gfx/image/image_skia.h" 96 #include "ui/gfx/image/image_skia.h"
97 #include "ui/keyboard/keyboard_controller.h" 97 #include "ui/keyboard/keyboard_controller.h"
98 #include "ui/keyboard/keyboard_switches.h" 98 #include "ui/keyboard/keyboard_switches.h"
99 #include "ui/keyboard/keyboard_util.h" 99 #include "ui/keyboard/keyboard_util.h"
100 #include "ui/message_center/message_center.h" 100 #include "ui/message_center/message_center.h"
101 #include "ui/views/corewm/tooltip_aura.h" 101 #include "ui/views/corewm/tooltip_aura.h"
102 #include "ui/views/corewm/tooltip_controller.h" 102 #include "ui/views/corewm/tooltip_controller.h"
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 897 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
898 return std::unique_ptr<ui::EventTargetIterator>(); 898 return std::unique_ptr<ui::EventTargetIterator>();
899 } 899 }
900 900
901 ui::EventTargeter* Shell::GetEventTargeter() { 901 ui::EventTargeter* Shell::GetEventTargeter() {
902 NOTREACHED(); 902 NOTREACHED();
903 return nullptr; 903 return nullptr;
904 } 904 }
905 905
906 } // namespace ash 906 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698