| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/aura/wm_shell_aura.h" | 5 #include "ash/aura/wm_shell_aura.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
| 10 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/common/shell_delegate.h" | 11 #include "ash/common/shell_delegate.h" |
| 12 #include "ash/common/shell_observer.h" | 12 #include "ash/common/shell_observer.h" |
| 13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" | 13 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard
.h" |
| 14 #include "ash/common/wm/mru_window_tracker.h" | 14 #include "ash/common/wm/mru_window_tracker.h" |
| 15 #include "ash/common/wm/overview/window_selector_controller.h" | 15 #include "ash/common/wm/overview/window_selector_controller.h" |
| 16 #include "ash/common/wm_activation_observer.h" | 16 #include "ash/common/wm_activation_observer.h" |
| 17 #include "ash/common/wm_display_observer.h" | 17 #include "ash/common/wm_display_observer.h" |
| 18 #include "ash/display/display_manager.h" | 18 #include "ash/display/display_manager.h" |
| 19 #include "ash/display/window_tree_host_manager.h" | 19 #include "ash/display/window_tree_host_manager.h" |
| 20 #include "ash/metrics/task_switch_metrics_recorder.h" | 20 #include "ash/metrics/task_switch_metrics_recorder.h" |
| 21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
| 22 #include "ash/touch/touch_uma.h" | 22 #include "ash/touch/touch_uma.h" |
| 23 #include "ash/wm/drag_window_resizer.h" | 23 #include "ash/wm/drag_window_resizer.h" |
| 24 #include "ash/wm/immersive_fullscreen_controller.h" |
| 24 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" | 25 #include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h" |
| 25 #include "ash/wm/screen_pinning_controller.h" | 26 #include "ash/wm/screen_pinning_controller.h" |
| 26 #include "ash/wm/window_cycle_event_filter_aura.h" | 27 #include "ash/wm/window_cycle_event_filter_aura.h" |
| 27 #include "ash/wm/window_util.h" | 28 #include "ash/wm/window_util.h" |
| 28 #include "base/memory/ptr_util.h" | 29 #include "base/memory/ptr_util.h" |
| 29 #include "ui/aura/client/focus_client.h" | 30 #include "ui/aura/client/focus_client.h" |
| 30 #include "ui/aura/env.h" | 31 #include "ui/aura/env.h" |
| 31 #include "ui/wm/public/activation_client.h" | 32 #include "ui/wm/public/activation_client.h" |
| 32 | 33 |
| 33 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> | 179 std::unique_ptr<ScopedDisableInternalMouseAndKeyboard> |
| 179 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() { | 180 WmShellAura::CreateScopedDisableInternalMouseAndKeyboard() { |
| 180 #if defined(USE_X11) | 181 #if defined(USE_X11) |
| 181 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11); | 182 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardX11); |
| 182 #elif defined(USE_OZONE) | 183 #elif defined(USE_OZONE) |
| 183 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); | 184 return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone); |
| 184 #endif | 185 #endif |
| 185 return nullptr; | 186 return nullptr; |
| 186 } | 187 } |
| 187 | 188 |
| 189 std::unique_ptr<WmImmersiveFullscreenController> |
| 190 WmShellAura::CreateImmersiveFullscreenController() { |
| 191 return base::MakeUnique<ImmersiveFullscreenController>(); |
| 192 } |
| 193 |
| 188 void WmShellAura::OnOverviewModeStarting() { | 194 void WmShellAura::OnOverviewModeStarting() { |
| 189 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), | 195 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), |
| 190 OnOverviewModeStarting()); | 196 OnOverviewModeStarting()); |
| 191 } | 197 } |
| 192 | 198 |
| 193 void WmShellAura::OnOverviewModeEnded() { | 199 void WmShellAura::OnOverviewModeEnded() { |
| 194 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); | 200 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); |
| 195 } | 201 } |
| 196 | 202 |
| 197 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { | 203 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() { |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 272 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 267 OnDisplayConfigurationChanging()); | 273 OnDisplayConfigurationChanging()); |
| 268 } | 274 } |
| 269 | 275 |
| 270 void WmShellAura::OnDisplayConfigurationChanged() { | 276 void WmShellAura::OnDisplayConfigurationChanged() { |
| 271 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 277 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
| 272 OnDisplayConfigurationChanged()); | 278 OnDisplayConfigurationChanged()); |
| 273 } | 279 } |
| 274 | 280 |
| 275 } // namespace ash | 281 } // namespace ash |
| OLD | NEW |