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 #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/gesture_action_type.h" | 15 #include "ash/common/metrics/gesture_action_type.h" |
| 16 #include "ash/common/metrics/user_metrics_action.h" | 16 #include "ash/common/metrics/user_metrics_action.h" |
| 17 #include "ash/common/wm/lock_state_observer.h" | 17 #include "ash/common/wm/lock_state_observer.h" |
| 18 #include "base/observer_list.h" | 18 #include "base/observer_list.h" |
| 19 #include "components/ui_devtools/devtools_server.h" | 19 #include "components/ui_devtools/devtools_server.h" |
| 20 #include "ui/app_list/presenter/app_list.h" | |
|
James Cook
2016/12/10 00:50:08
Hmm. I've been trying to avoid dependencies in wm_
msw
2016/12/10 01:08:12
Done.
| |
| 20 #include "ui/base/ui_base_types.h" | 21 #include "ui/base/ui_base_types.h" |
| 21 #include "ui/compositor/layer_type.h" | 22 #include "ui/compositor/layer_type.h" |
| 22 #include "ui/wm/public/window_types.h" | 23 #include "ui/wm/public/window_types.h" |
| 23 | 24 |
| 24 namespace base { | 25 namespace base { |
| 25 class SequencedWorkerPool; | 26 class SequencedWorkerPool; |
| 26 } | 27 } |
| 27 | 28 |
| 28 namespace display { | 29 namespace display { |
| 29 class Display; | 30 class Display; |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 109 ShellDelegate* delegate() { return delegate_.get(); } | 110 ShellDelegate* delegate() { return delegate_.get(); } |
| 110 | 111 |
| 111 AcceleratorController* accelerator_controller() { | 112 AcceleratorController* accelerator_controller() { |
| 112 return accelerator_controller_.get(); | 113 return accelerator_controller_.get(); |
| 113 } | 114 } |
| 114 | 115 |
| 115 AccessibilityDelegate* accessibility_delegate() { | 116 AccessibilityDelegate* accessibility_delegate() { |
| 116 return accessibility_delegate_.get(); | 117 return accessibility_delegate_.get(); |
| 117 } | 118 } |
| 118 | 119 |
| 120 app_list::AppList* app_list() { return app_list_.get(); } | |
| 121 | |
| 119 BrightnessControlDelegate* brightness_control_delegate() { | 122 BrightnessControlDelegate* brightness_control_delegate() { |
| 120 return brightness_control_delegate_.get(); | 123 return brightness_control_delegate_.get(); |
| 121 } | 124 } |
| 122 | 125 |
| 123 CastConfigController* cast_config() { return cast_config_.get(); } | 126 CastConfigController* cast_config() { return cast_config_.get(); } |
| 124 | 127 |
| 125 FocusCycler* focus_cycler() { return focus_cycler_.get(); } | 128 FocusCycler* focus_cycler() { return focus_cycler_.get(); } |
| 126 | 129 |
| 127 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { | 130 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { |
| 128 return keyboard_brightness_control_delegate_.get(); | 131 return keyboard_brightness_control_delegate_.get(); |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 471 friend class Shell; | 474 friend class Shell; |
| 472 friend class WmShellTestApi; | 475 friend class WmShellTestApi; |
| 473 | 476 |
| 474 static WmShell* instance_; | 477 static WmShell* instance_; |
| 475 | 478 |
| 476 base::ObserverList<ShellObserver> shell_observers_; | 479 base::ObserverList<ShellObserver> shell_observers_; |
| 477 std::unique_ptr<ShellDelegate> delegate_; | 480 std::unique_ptr<ShellDelegate> delegate_; |
| 478 | 481 |
| 479 std::unique_ptr<AcceleratorController> accelerator_controller_; | 482 std::unique_ptr<AcceleratorController> accelerator_controller_; |
| 480 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 483 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 484 std::unique_ptr<app_list::AppList> app_list_; | |
| 481 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; | 485 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| 482 std::unique_ptr<CastConfigController> cast_config_; | 486 std::unique_ptr<CastConfigController> cast_config_; |
| 483 std::unique_ptr<FocusCycler> focus_cycler_; | 487 std::unique_ptr<FocusCycler> focus_cycler_; |
| 484 std::unique_ptr<ImmersiveContextAsh> immersive_context_; | 488 std::unique_ptr<ImmersiveContextAsh> immersive_context_; |
| 485 std::unique_ptr<KeyboardBrightnessControlDelegate> | 489 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 486 keyboard_brightness_control_delegate_; | 490 keyboard_brightness_control_delegate_; |
| 487 std::unique_ptr<KeyboardUI> keyboard_ui_; | 491 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| 488 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; | 492 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; |
| 489 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; | 493 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; |
| 490 std::unique_ptr<MediaDelegate> media_delegate_; | 494 std::unique_ptr<MediaDelegate> media_delegate_; |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 517 | 521 |
| 518 #if defined(OS_CHROMEOS) | 522 #if defined(OS_CHROMEOS) |
| 519 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 523 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 520 std::unique_ptr<VpnList> vpn_list_; | 524 std::unique_ptr<VpnList> vpn_list_; |
| 521 #endif | 525 #endif |
| 522 }; | 526 }; |
| 523 | 527 |
| 524 } // namespace ash | 528 } // namespace ash |
| 525 | 529 |
| 526 #endif // ASH_COMMON_WM_SHELL_H_ | 530 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |