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> |
| 8 |
7 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
9 #include "ash/common/shell_delegate.h" | 11 #include "ash/common/shell_delegate.h" |
10 #include "ash/common/shell_observer.h" | 12 #include "ash/common/shell_observer.h" |
11 #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" |
12 #include "ash/common/wm/mru_window_tracker.h" | 14 #include "ash/common/wm/mru_window_tracker.h" |
13 #include "ash/common/wm/overview/window_selector_controller.h" | 15 #include "ash/common/wm/overview/window_selector_controller.h" |
14 #include "ash/common/wm_activation_observer.h" | 16 #include "ash/common/wm_activation_observer.h" |
15 #include "ash/common/wm_display_observer.h" | 17 #include "ash/common/wm_display_observer.h" |
16 #include "ash/display/display_manager.h" | 18 #include "ash/display/display_manager.h" |
(...skipping 14 matching lines...) Expand all Loading... |
31 #if defined(USE_X11) | 33 #if defined(USE_X11) |
32 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" | 34 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" |
33 #endif | 35 #endif |
34 | 36 |
35 #if defined(USE_OZONE) | 37 #if defined(USE_OZONE) |
36 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" | 38 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.
h" |
37 #endif | 39 #endif |
38 | 40 |
39 namespace ash { | 41 namespace ash { |
40 | 42 |
41 WmShellAura::WmShellAura(ShellDelegate* delegate) : WmShell(delegate) { | 43 WmShellAura::WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate) |
| 44 : WmShell(std::move(shell_delegate)) { |
42 WmShell::Set(this); | 45 WmShell::Set(this); |
43 } | 46 } |
44 | 47 |
45 WmShellAura::~WmShellAura() { | 48 WmShellAura::~WmShellAura() { |
46 WmShell::Set(nullptr); | 49 WmShell::Set(nullptr); |
47 } | 50 } |
48 | 51 |
49 void WmShellAura::PrepareForShutdown() { | 52 void WmShellAura::PrepareForShutdown() { |
50 if (added_activation_observer_) | 53 if (added_activation_observer_) |
51 Shell::GetInstance()->activation_client()->RemoveObserver(this); | 54 Shell::GetInstance()->activation_client()->RemoveObserver(this); |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 232 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
230 OnDisplayConfigurationChanging()); | 233 OnDisplayConfigurationChanging()); |
231 } | 234 } |
232 | 235 |
233 void WmShellAura::OnDisplayConfigurationChanged() { | 236 void WmShellAura::OnDisplayConfigurationChanged() { |
234 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, | 237 FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_, |
235 OnDisplayConfigurationChanged()); | 238 OnDisplayConfigurationChanged()); |
236 } | 239 } |
237 | 240 |
238 } // namespace ash | 241 } // namespace ash |
OLD | NEW |