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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 #include "ash/wm/ash_native_cursor_manager.h" | 95 #include "ash/wm/ash_native_cursor_manager.h" |
96 #include "ash/wm/container_finder.h" | 96 #include "ash/wm/container_finder.h" |
97 #include "ash/wm/event_client_impl.h" | 97 #include "ash/wm/event_client_impl.h" |
98 #include "ash/wm/immersive_context_ash.h" | 98 #include "ash/wm/immersive_context_ash.h" |
99 #include "ash/wm/immersive_handler_factory_ash.h" | 99 #include "ash/wm/immersive_handler_factory_ash.h" |
100 #include "ash/wm/lock_state_controller.h" | 100 #include "ash/wm/lock_state_controller.h" |
101 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 101 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
102 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" | 102 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" |
103 #include "ash/wm/mru_window_tracker.h" | 103 #include "ash/wm/mru_window_tracker.h" |
104 #include "ash/wm/overlay_event_filter.h" | 104 #include "ash/wm/overlay_event_filter.h" |
105 #include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h" | |
106 #include "ash/wm/overview/window_selector_controller.h" | 105 #include "ash/wm/overview/window_selector_controller.h" |
107 #include "ash/wm/power_button_controller.h" | 106 #include "ash/wm/power_button_controller.h" |
108 #include "ash/wm/resize_shadow_controller.h" | 107 #include "ash/wm/resize_shadow_controller.h" |
109 #include "ash/wm/root_window_finder.h" | 108 #include "ash/wm/root_window_finder.h" |
110 #include "ash/wm/screen_pinning_controller.h" | 109 #include "ash/wm/screen_pinning_controller.h" |
111 #include "ash/wm/system_gesture_event_filter.h" | 110 #include "ash/wm/system_gesture_event_filter.h" |
112 #include "ash/wm/system_modal_container_event_filter.h" | 111 #include "ash/wm/system_modal_container_event_filter.h" |
113 #include "ash/wm/system_modal_container_layout_manager.h" | 112 #include "ash/wm/system_modal_container_layout_manager.h" |
114 #include "ash/wm/toplevel_window_event_handler.h" | 113 #include "ash/wm/toplevel_window_event_handler.h" |
115 #include "ash/wm/video_detector.h" | 114 #include "ash/wm/video_detector.h" |
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 devtools_server_->AttachClient(std::move(devtools_client)); | 838 devtools_server_->AttachClient(std::move(devtools_client)); |
840 } | 839 } |
841 | 840 |
842 if (config == Config::MASH) | 841 if (config == Config::MASH) |
843 app_list_delegate_impl_ = base::MakeUnique<AppListDelegateImpl>(); | 842 app_list_delegate_impl_ = base::MakeUnique<AppListDelegateImpl>(); |
844 | 843 |
845 // TODO(sky): move creation to ShellPort. | 844 // TODO(sky): move creation to ShellPort. |
846 if (config != Config::MASH) | 845 if (config != Config::MASH) |
847 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); | 846 immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryAsh>(); |
848 | 847 |
849 scoped_overview_animation_settings_factory_.reset( | |
850 new ScopedOverviewAnimationSettingsFactoryAura); | |
851 window_positioner_ = base::MakeUnique<WindowPositioner>(); | 848 window_positioner_ = base::MakeUnique<WindowPositioner>(); |
852 | 849 |
853 if (config == Config::CLASSIC) { | 850 if (config == Config::CLASSIC) { |
854 // TODO: needs to work in mus. http://crbug.com/705592. | 851 // TODO: needs to work in mus. http://crbug.com/705592. |
855 native_cursor_manager_ = new AshNativeCursorManager; | 852 native_cursor_manager_ = new AshNativeCursorManager; |
856 cursor_manager_.reset( | 853 cursor_manager_.reset( |
857 new CursorManager(base::WrapUnique(native_cursor_manager_))); | 854 new CursorManager(base::WrapUnique(native_cursor_manager_))); |
858 } | 855 } |
859 | 856 |
860 shell_delegate_->PreInit(); | 857 shell_delegate_->PreInit(); |
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1272 void Shell::OnPrefServiceInitialized( | 1269 void Shell::OnPrefServiceInitialized( |
1273 std::unique_ptr<::PrefService> pref_service) { | 1270 std::unique_ptr<::PrefService> pref_service) { |
1274 if (!instance_) | 1271 if (!instance_) |
1275 return; | 1272 return; |
1276 // |pref_service_| is null if can't connect to Chrome (as happens when | 1273 // |pref_service_| is null if can't connect to Chrome (as happens when |
1277 // running mash outside of chrome --mash and chrome isn't built). | 1274 // running mash outside of chrome --mash and chrome isn't built). |
1278 pref_service_ = std::move(pref_service); | 1275 pref_service_ = std::move(pref_service); |
1279 } | 1276 } |
1280 | 1277 |
1281 } // namespace ash | 1278 } // namespace ash |
OLD | NEW |