| 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 "ash/common/focus_cycler.h" | 7 #include "ash/common/focus_cycler.h" |
| 8 #include "ash/common/keyboard/keyboard_ui.h" | 8 #include "ash/common/keyboard/keyboard_ui.h" |
| 9 #include "ash/common/shell_delegate.h" | 9 #include "ash/common/shell_delegate.h" |
| 10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| 11 #include "ash/common/system/brightness_control_delegate.h" |
| 11 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" | 12 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h" |
| 12 #include "ash/common/system/tray/system_tray_delegate.h" | 13 #include "ash/common/system/tray/system_tray_delegate.h" |
| 13 #include "ash/common/system/tray/system_tray_notifier.h" | 14 #include "ash/common/system/tray/system_tray_notifier.h" |
| 14 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 15 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| 15 #include "ash/common/wm/mru_window_tracker.h" | 16 #include "ash/common/wm/mru_window_tracker.h" |
| 16 #include "ash/common/wm/overview/window_selector_controller.h" | 17 #include "ash/common/wm/overview/window_selector_controller.h" |
| 17 #include "ash/common/wm_window.h" | 18 #include "ash/common/wm_window.h" |
| 18 #include "base/bind.h" | 19 #include "base/bind.h" |
| 19 #include "base/logging.h" | 20 #include "base/logging.h" |
| 20 | 21 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 continue; | 76 continue; |
| 76 for (const WmWindow* child : system_modal->GetChildren()) { | 77 for (const WmWindow* child : system_modal->GetChildren()) { |
| 77 if (child->IsSystemModal() && child->GetTargetVisibility()) { | 78 if (child->IsSystemModal() && child->GetTargetVisibility()) { |
| 78 return true; | 79 return true; |
| 79 } | 80 } |
| 80 } | 81 } |
| 81 } | 82 } |
| 82 return false; | 83 return false; |
| 83 } | 84 } |
| 84 | 85 |
| 86 void WmShell::SetBrightnessControlDelegate( |
| 87 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate) { |
| 88 brightness_control_delegate_ = std::move(brightness_control_delegate); |
| 89 } |
| 90 |
| 85 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) { | 91 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) { |
| 86 keyboard_ui_ = std::move(keyboard_ui); | 92 keyboard_ui_ = std::move(keyboard_ui); |
| 87 } | 93 } |
| 88 | 94 |
| 89 void WmShell::SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate) { | 95 void WmShell::SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate) { |
| 90 media_delegate_ = std::move(delegate); | 96 media_delegate_ = std::move(delegate); |
| 91 } | 97 } |
| 92 | 98 |
| 93 void WmShell::SetSystemTrayDelegate( | 99 void WmShell::SetSystemTrayDelegate( |
| 94 std::unique_ptr<SystemTrayDelegate> delegate) { | 100 std::unique_ptr<SystemTrayDelegate> delegate) { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 | 132 |
| 127 void WmShell::CreateMruWindowTracker() { | 133 void WmShell::CreateMruWindowTracker() { |
| 128 mru_window_tracker_.reset(new MruWindowTracker); | 134 mru_window_tracker_.reset(new MruWindowTracker); |
| 129 } | 135 } |
| 130 | 136 |
| 131 void WmShell::DeleteMruWindowTracker() { | 137 void WmShell::DeleteMruWindowTracker() { |
| 132 mru_window_tracker_.reset(); | 138 mru_window_tracker_.reset(); |
| 133 } | 139 } |
| 134 | 140 |
| 135 } // namespace ash | 141 } // namespace ash |
| OLD | NEW |