Chromium Code Reviews| 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/accessibility_delegate.h" | 9 #include "ash/common/accessibility_delegate.h" |
| 10 #include "ash/common/focus_cycler.h" | 10 #include "ash/common/focus_cycler.h" |
| 11 #include "ash/common/keyboard/keyboard_ui.h" | 11 #include "ash/common/keyboard/keyboard_ui.h" |
| 12 #include "ash/common/shell_delegate.h" | 12 #include "ash/common/shell_delegate.h" |
| 13 #include "ash/common/shell_window_ids.h" | 13 #include "ash/common/shell_window_ids.h" |
| 14 #include "ash/common/system/brightness_control_delegate.h" | 14 #include "ash/common/system/brightness_control_delegate.h" |
| 15 #include "ash/common/system/keyboard_brightness_control_delegate.h" | 15 #include "ash/common/system/keyboard_brightness_control_delegate.h" |
| 16 #include "ash/common/system/tray/system_tray_delegate.h" | 16 #include "ash/common/system/tray/system_tray_delegate.h" |
| 17 #include "ash/common/system/tray/system_tray_notifier.h" | 17 #include "ash/common/system/tray/system_tray_notifier.h" |
| 18 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 18 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 19 #include "ash/common/wm/mru_window_tracker.h" | 19 #include "ash/common/wm/mru_window_tracker.h" |
| 20 #include "ash/common/wm/overview/window_selector_controller.h" | 20 #include "ash/common/wm/overview/window_selector_controller.h" |
| 21 #include "ash/common/wm/window_cycle_controller.h" | |
| 21 #include "ash/common/wm_window.h" | 22 #include "ash/common/wm_window.h" |
| 22 #include "base/bind.h" | 23 #include "base/bind.h" |
| 23 #include "base/logging.h" | 24 #include "base/logging.h" |
| 24 | 25 |
| 25 #if defined(OS_CHROMEOS) | 26 #if defined(OS_CHROMEOS) |
| 26 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h " | 27 #include "ash/common/system/chromeos/brightness/brightness_controller_chromeos.h " |
| 27 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" | 28 #include "ash/common/system/chromeos/keyboard_brightness_controller.h" |
| 28 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" | 29 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" |
| 29 #endif | 30 #endif |
| 30 | 31 |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 } | 134 } |
| 134 | 135 |
| 135 void WmShell::DeleteSystemTrayDelegate() { | 136 void WmShell::DeleteSystemTrayDelegate() { |
| 136 DCHECK(system_tray_delegate_); | 137 DCHECK(system_tray_delegate_); |
| 137 #if defined(OS_CHROMEOS) | 138 #if defined(OS_CHROMEOS) |
| 138 logout_confirmation_controller_.reset(); | 139 logout_confirmation_controller_.reset(); |
| 139 #endif | 140 #endif |
| 140 system_tray_delegate_.reset(); | 141 system_tray_delegate_.reset(); |
| 141 } | 142 } |
| 142 | 143 |
| 144 void WmShell::CreateWindowCycleController() { | |
| 145 window_cycle_controller_.reset(new WindowCycleController()); | |
|
James Cook
2016/07/19 15:42:21
It doesn't look like WindowCycleController does an
sky
2016/07/19 17:05:18
Creation can happen at any time, but destruction d
| |
| 146 } | |
| 147 | |
| 148 void WmShell::DeleteWindowCycleController() { | |
| 149 window_cycle_controller_.reset(); | |
| 150 } | |
| 151 | |
| 143 void WmShell::DeleteWindowSelectorController() { | 152 void WmShell::DeleteWindowSelectorController() { |
| 144 window_selector_controller_.reset(); | 153 window_selector_controller_.reset(); |
| 145 } | 154 } |
| 146 | 155 |
| 147 void WmShell::CreateMaximizeModeController() { | 156 void WmShell::CreateMaximizeModeController() { |
| 148 maximize_mode_controller_.reset(new MaximizeModeController); | 157 maximize_mode_controller_.reset(new MaximizeModeController); |
| 149 } | 158 } |
| 150 | 159 |
| 151 void WmShell::DeleteMaximizeModeController() { | 160 void WmShell::DeleteMaximizeModeController() { |
| 152 maximize_mode_controller_.reset(); | 161 maximize_mode_controller_.reset(); |
| 153 } | 162 } |
| 154 | 163 |
| 155 void WmShell::CreateMruWindowTracker() { | 164 void WmShell::CreateMruWindowTracker() { |
| 156 mru_window_tracker_.reset(new MruWindowTracker); | 165 mru_window_tracker_.reset(new MruWindowTracker); |
| 157 } | 166 } |
| 158 | 167 |
| 159 void WmShell::DeleteMruWindowTracker() { | 168 void WmShell::DeleteMruWindowTracker() { |
| 160 mru_window_tracker_.reset(); | 169 mru_window_tracker_.reset(); |
| 161 } | 170 } |
| 162 | 171 |
| 163 } // namespace ash | 172 } // namespace ash |
| OLD | NEW |