| 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/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 19 matching lines...) Expand all Loading... |
| 30 #include "ash/common/shell_window_ids.h" | 30 #include "ash/common/shell_window_ids.h" |
| 31 #include "ash/common/system/locale/locale_notification_controller.h" | 31 #include "ash/common/system/locale/locale_notification_controller.h" |
| 32 #include "ash/common/system/status_area_widget.h" | 32 #include "ash/common/system/status_area_widget.h" |
| 33 #include "ash/common/system/tray/system_tray_delegate.h" | 33 #include "ash/common/system/tray/system_tray_delegate.h" |
| 34 #include "ash/common/wallpaper/wallpaper_delegate.h" | 34 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 35 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 35 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 36 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" | 36 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" |
| 37 #include "ash/common/wm/mru_window_tracker.h" | 37 #include "ash/common/wm/mru_window_tracker.h" |
| 38 #include "ash/common/wm/root_window_finder.h" | 38 #include "ash/common/wm/root_window_finder.h" |
| 39 #include "ash/common/wm/window_positioner.h" | 39 #include "ash/common/wm/window_positioner.h" |
| 40 #include "ash/common/wm/workspace_controller.h" |
| 40 #include "ash/common/wm_shell.h" | 41 #include "ash/common/wm_shell.h" |
| 41 #include "ash/desktop_background/desktop_background_controller.h" | 42 #include "ash/desktop_background/desktop_background_controller.h" |
| 42 #include "ash/desktop_background/desktop_background_view.h" | 43 #include "ash/desktop_background/desktop_background_view.h" |
| 43 #include "ash/display/cursor_window_controller.h" | 44 #include "ash/display/cursor_window_controller.h" |
| 44 #include "ash/display/display_configuration_controller.h" | 45 #include "ash/display/display_configuration_controller.h" |
| 45 #include "ash/display/display_manager.h" | 46 #include "ash/display/display_manager.h" |
| 46 #include "ash/display/event_transformation_handler.h" | 47 #include "ash/display/event_transformation_handler.h" |
| 47 #include "ash/display/mouse_cursor_event_filter.h" | 48 #include "ash/display/mouse_cursor_event_filter.h" |
| 48 #include "ash/display/screen_position_controller.h" | 49 #include "ash/display/screen_position_controller.h" |
| 49 #include "ash/display/window_tree_host_manager.h" | 50 #include "ash/display/window_tree_host_manager.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 68 #include "ash/wm/resize_shadow_controller.h" | 69 #include "ash/wm/resize_shadow_controller.h" |
| 69 #include "ash/wm/screen_pinning_controller.h" | 70 #include "ash/wm/screen_pinning_controller.h" |
| 70 #include "ash/wm/system_gesture_event_filter.h" | 71 #include "ash/wm/system_gesture_event_filter.h" |
| 71 #include "ash/wm/system_modal_container_event_filter.h" | 72 #include "ash/wm/system_modal_container_event_filter.h" |
| 72 #include "ash/wm/system_modal_container_layout_manager.h" | 73 #include "ash/wm/system_modal_container_layout_manager.h" |
| 73 #include "ash/wm/toplevel_window_event_handler.h" | 74 #include "ash/wm/toplevel_window_event_handler.h" |
| 74 #include "ash/wm/video_detector.h" | 75 #include "ash/wm/video_detector.h" |
| 75 #include "ash/wm/window_animations.h" | 76 #include "ash/wm/window_animations.h" |
| 76 #include "ash/wm/window_properties.h" | 77 #include "ash/wm/window_properties.h" |
| 77 #include "ash/wm/window_util.h" | 78 #include "ash/wm/window_util.h" |
| 78 #include "ash/wm/workspace_controller.h" | |
| 79 #include "base/bind.h" | 79 #include "base/bind.h" |
| 80 #include "base/memory/ptr_util.h" | 80 #include "base/memory/ptr_util.h" |
| 81 #include "base/trace_event/trace_event.h" | 81 #include "base/trace_event/trace_event.h" |
| 82 #include "ui/aura/client/aura_constants.h" | 82 #include "ui/aura/client/aura_constants.h" |
| 83 #include "ui/aura/env.h" | 83 #include "ui/aura/env.h" |
| 84 #include "ui/aura/layout_manager.h" | 84 #include "ui/aura/layout_manager.h" |
| 85 #include "ui/aura/window.h" | 85 #include "ui/aura/window.h" |
| 86 #include "ui/aura/window_event_dispatcher.h" | 86 #include "ui/aura/window_event_dispatcher.h" |
| 87 #include "ui/base/ui_base_switches.h" | 87 #include "ui/base/ui_base_switches.h" |
| 88 #include "ui/base/user_activity/user_activity_detector.h" | 88 #include "ui/base/user_activity/user_activity_detector.h" |
| (...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1036 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 1037 return std::unique_ptr<ui::EventTargetIterator>(); | 1037 return std::unique_ptr<ui::EventTargetIterator>(); |
| 1038 } | 1038 } |
| 1039 | 1039 |
| 1040 ui::EventTargeter* Shell::GetEventTargeter() { | 1040 ui::EventTargeter* Shell::GetEventTargeter() { |
| 1041 NOTREACHED(); | 1041 NOTREACHED(); |
| 1042 return nullptr; | 1042 return nullptr; |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 } // namespace ash | 1045 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2292183003:
Moves WorkspaceController to ash/common (Closed)
