| 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 #ifndef ASH_COMMON_WM_SHELL_H_ | 5 #ifndef ASH_COMMON_WM_SHELL_H_ |
| 6 #define ASH_COMMON_WM_SHELL_H_ | 6 #define ASH_COMMON_WM_SHELL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "ash/ash_export.h" | 13 #include "ash/ash_export.h" |
| 14 #include "ash/common/media_delegate.h" | 14 #include "ash/common/media_delegate.h" |
| 15 #include "ash/common/metrics/user_metrics_action.h" | 15 #include "ash/common/metrics/user_metrics_action.h" |
| 16 #include "base/observer_list.h" | 16 #include "base/observer_list.h" |
| 17 | 17 |
| 18 namespace views { | 18 namespace views { |
| 19 class PointerWatcher; | 19 class PointerDownWatcher; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace ash { | 22 namespace ash { |
| 23 | 23 |
| 24 class AccessibilityDelegate; | 24 class AccessibilityDelegate; |
| 25 class BrightnessControlDelegate; | 25 class BrightnessControlDelegate; |
| 26 class DisplayInfo; | 26 class DisplayInfo; |
| 27 class FocusCycler; | 27 class FocusCycler; |
| 28 class KeyboardBrightnessControlDelegate; | 28 class KeyboardBrightnessControlDelegate; |
| 29 class KeyboardUI; | 29 class KeyboardUI; |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 | 215 |
| 216 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; | 216 virtual void AddActivationObserver(WmActivationObserver* observer) = 0; |
| 217 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; | 217 virtual void RemoveActivationObserver(WmActivationObserver* observer) = 0; |
| 218 | 218 |
| 219 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; | 219 virtual void AddDisplayObserver(WmDisplayObserver* observer) = 0; |
| 220 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; | 220 virtual void RemoveDisplayObserver(WmDisplayObserver* observer) = 0; |
| 221 | 221 |
| 222 void AddShellObserver(ShellObserver* observer); | 222 void AddShellObserver(ShellObserver* observer); |
| 223 void RemoveShellObserver(ShellObserver* observer); | 223 void RemoveShellObserver(ShellObserver* observer); |
| 224 | 224 |
| 225 virtual void AddPointerWatcher(views::PointerWatcher* watcher) = 0; | 225 virtual void AddPointerDownWatcher(views::PointerDownWatcher* watcher) = 0; |
| 226 virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0; | 226 virtual void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) = 0; |
| 227 | 227 |
| 228 #if defined(OS_CHROMEOS) | 228 #if defined(OS_CHROMEOS) |
| 229 LogoutConfirmationController* logout_confirmation_controller() { | 229 LogoutConfirmationController* logout_confirmation_controller() { |
| 230 return logout_confirmation_controller_.get(); | 230 return logout_confirmation_controller_.get(); |
| 231 } | 231 } |
| 232 | 232 |
| 233 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved. | 233 // TODO(jamescook): Remove this when VirtualKeyboardController has been moved. |
| 234 virtual void ToggleIgnoreExternalKeyboard() = 0; | 234 virtual void ToggleIgnoreExternalKeyboard() = 0; |
| 235 #endif | 235 #endif |
| 236 | 236 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 bool simulate_modal_window_open_for_testing_ = false; | 285 bool simulate_modal_window_open_for_testing_ = false; |
| 286 | 286 |
| 287 #if defined(OS_CHROMEOS) | 287 #if defined(OS_CHROMEOS) |
| 288 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 288 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 289 #endif | 289 #endif |
| 290 }; | 290 }; |
| 291 | 291 |
| 292 } // namespace ash | 292 } // namespace ash |
| 293 | 293 |
| 294 #endif // ASH_COMMON_WM_SHELL_H_ | 294 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |