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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "ash/magnifier/magnification_controller.h" | 54 #include "ash/magnifier/magnification_controller.h" |
55 #include "ash/magnifier/partial_magnification_controller.h" | 55 #include "ash/magnifier/partial_magnification_controller.h" |
56 #include "ash/root_window_controller.h" | 56 #include "ash/root_window_controller.h" |
57 #include "ash/shelf/shelf.h" | 57 #include "ash/shelf/shelf.h" |
58 #include "ash/shelf/shelf_widget.h" | 58 #include "ash/shelf/shelf_widget.h" |
59 #include "ash/shell_init_params.h" | 59 #include "ash/shell_init_params.h" |
60 #include "ash/utility/screenshot_controller.h" | 60 #include "ash/utility/screenshot_controller.h" |
61 #include "ash/wm/ash_focus_rules.h" | 61 #include "ash/wm/ash_focus_rules.h" |
62 #include "ash/wm/ash_native_cursor_manager.h" | 62 #include "ash/wm/ash_native_cursor_manager.h" |
63 #include "ash/wm/event_client_impl.h" | 63 #include "ash/wm/event_client_impl.h" |
64 #include "ash/wm/immersive_context_ash.h" | |
65 #include "ash/wm/immersive_handler_factory_ash.h" | 64 #include "ash/wm/immersive_handler_factory_ash.h" |
66 #include "ash/wm/lock_state_controller.h" | 65 #include "ash/wm/lock_state_controller.h" |
67 #include "ash/wm/overlay_event_filter.h" | 66 #include "ash/wm/overlay_event_filter.h" |
68 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" | 67 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" |
69 #include "ash/wm/power_button_controller.h" | 68 #include "ash/wm/power_button_controller.h" |
70 #include "ash/wm/resize_shadow_controller.h" | 69 #include "ash/wm/resize_shadow_controller.h" |
71 #include "ash/wm/screen_pinning_controller.h" | 70 #include "ash/wm/screen_pinning_controller.h" |
72 #include "ash/wm/system_gesture_event_filter.h" | 71 #include "ash/wm/system_gesture_event_filter.h" |
73 #include "ash/wm/system_modal_container_event_filter.h" | 72 #include "ash/wm/system_modal_container_event_filter.h" |
74 #include "ash/wm/system_modal_container_layout_manager.h" | 73 #include "ash/wm/system_modal_container_layout_manager.h" |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 | 696 |
698 DCHECK(instance_ == this); | 697 DCHECK(instance_ == this); |
699 instance_ = nullptr; | 698 instance_ = nullptr; |
700 } | 699 } |
701 | 700 |
702 void Shell::Init(const ShellInitParams& init_params) { | 701 void Shell::Init(const ShellInitParams& init_params) { |
703 wm_shell_->Initialize(); | 702 wm_shell_->Initialize(); |
704 | 703 |
705 in_mus_ = init_params.in_mus; | 704 in_mus_ = init_params.in_mus; |
706 | 705 |
707 immersive_context_ = base::MakeUnique<ImmersiveContextAsh>(); | |
708 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); | 706 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); |
709 | 707 |
710 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 708 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
711 DCHECK(in_mus_) << "linux desktop does not support ash."; | 709 DCHECK(in_mus_) << "linux desktop does not support ash."; |
712 #endif | 710 #endif |
713 | 711 |
714 scoped_overview_animation_settings_factory_.reset( | 712 scoped_overview_animation_settings_factory_.reset( |
715 new ScopedOverviewAnimationSettingsFactoryAura); | 713 new ScopedOverviewAnimationSettingsFactoryAura); |
716 window_positioner_.reset(new WindowPositioner(wm_shell_.get())); | 714 window_positioner_.reset(new WindowPositioner(wm_shell_.get())); |
717 | 715 |
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 1042 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
1045 return std::unique_ptr<ui::EventTargetIterator>(); | 1043 return std::unique_ptr<ui::EventTargetIterator>(); |
1046 } | 1044 } |
1047 | 1045 |
1048 ui::EventTargeter* Shell::GetEventTargeter() { | 1046 ui::EventTargeter* Shell::GetEventTargeter() { |
1049 NOTREACHED(); | 1047 NOTREACHED(); |
1050 return nullptr; | 1048 return nullptr; |
1051 } | 1049 } |
1052 | 1050 |
1053 } // namespace ash | 1051 } // namespace ash |
OLD | NEW |