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/common/wm_shell.h" | 5 #include "ash/common/wm_shell.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
10 #include "ash/common/accelerators/ash_focus_manager_factory.h" | 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC | 83 // ShelfItemDelegate subclasses it owns have complex cleanup to run (e.g. ARC |
84 // shelf items in Chrome) so explicitly shutdown early. | 84 // shelf items in Chrome) so explicitly shutdown early. |
85 shelf_model_->DestroyItemDelegates(); | 85 shelf_model_->DestroyItemDelegates(); |
86 // Must be destroyed before FocusClient. | 86 // Must be destroyed before FocusClient. |
87 shelf_delegate_.reset(); | 87 shelf_delegate_.reset(); |
88 | 88 |
89 // Balances the Install() in Initialize(). | 89 // Balances the Install() in Initialize(). |
90 views::FocusManagerFactory::Install(nullptr); | 90 views::FocusManagerFactory::Install(nullptr); |
91 } | 91 } |
92 | 92 |
| 93 void WmShell::SetPaletteDelegateForTesting( |
| 94 std::unique_ptr<PaletteDelegate> palette_delegate) { |
| 95 palette_delegate_ = std::move(palette_delegate); |
| 96 } |
| 97 |
93 void WmShell::OnMaximizeModeStarted() { | 98 void WmShell::OnMaximizeModeStarted() { |
94 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted()); | 99 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted()); |
95 } | 100 } |
96 | 101 |
97 void WmShell::OnMaximizeModeEnded() { | 102 void WmShell::OnMaximizeModeEnded() { |
98 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded()); | 103 FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded()); |
99 } | 104 } |
100 | 105 |
101 void WmShell::NotifyFullscreenStateChanged(bool is_fullscreen, | 106 void WmShell::NotifyFullscreenStateChanged(bool is_fullscreen, |
102 WmWindow* root_window) { | 107 WmWindow* root_window) { |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 void WmShell::DeleteToastManager() { | 293 void WmShell::DeleteToastManager() { |
289 toast_manager_.reset(); | 294 toast_manager_.reset(); |
290 } | 295 } |
291 | 296 |
292 void WmShell::SetAcceleratorController( | 297 void WmShell::SetAcceleratorController( |
293 std::unique_ptr<AcceleratorController> accelerator_controller) { | 298 std::unique_ptr<AcceleratorController> accelerator_controller) { |
294 accelerator_controller_ = std::move(accelerator_controller); | 299 accelerator_controller_ = std::move(accelerator_controller); |
295 } | 300 } |
296 | 301 |
297 } // namespace ash | 302 } // namespace ash |
OLD | NEW |