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/system/locale/locale_notification_controller.h" | |
|
msw
2016/10/14 01:46:29
nit: use a fwd decl instead
| |
| 17 #include "ash/common/wm/lock_state_observer.h" | 18 #include "ash/common/wm/lock_state_observer.h" |
| 18 #include "base/observer_list.h" | 19 #include "base/observer_list.h" |
| 19 #include "ui/base/ui_base_types.h" | 20 #include "ui/base/ui_base_types.h" |
| 20 #include "ui/compositor/layer_type.h" | 21 #include "ui/compositor/layer_type.h" |
| 21 #include "ui/wm/public/window_types.h" | 22 #include "ui/wm/public/window_types.h" |
| 22 | 23 |
| 23 namespace base { | 24 namespace base { |
| 24 class SequencedWorkerPool; | 25 class SequencedWorkerPool; |
| 25 } | 26 } |
| 26 | 27 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 121 } | 122 } |
| 122 | 123 |
| 123 FocusCycler* focus_cycler() { return focus_cycler_.get(); } | 124 FocusCycler* focus_cycler() { return focus_cycler_.get(); } |
| 124 | 125 |
| 125 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { | 126 KeyboardBrightnessControlDelegate* keyboard_brightness_control_delegate() { |
| 126 return keyboard_brightness_control_delegate_.get(); | 127 return keyboard_brightness_control_delegate_.get(); |
| 127 } | 128 } |
| 128 | 129 |
| 129 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } | 130 KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); } |
| 130 | 131 |
| 132 LocaleNotificationController* locale_notification_controller() { | |
| 133 return locale_notification_controller_.get(); | |
| 134 } | |
| 135 | |
| 131 MaximizeModeController* maximize_mode_controller() { | 136 MaximizeModeController* maximize_mode_controller() { |
| 132 return maximize_mode_controller_.get(); | 137 return maximize_mode_controller_.get(); |
| 133 } | 138 } |
| 134 | 139 |
| 135 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } | 140 MruWindowTracker* mru_window_tracker() { return mru_window_tracker_.get(); } |
| 136 | 141 |
| 137 MediaDelegate* media_delegate() { return media_delegate_.get(); } | 142 MediaDelegate* media_delegate() { return media_delegate_.get(); } |
| 138 | 143 |
| 139 NewWindowDelegate* new_window_delegate() { | 144 NewWindowDelegate* new_window_delegate() { |
| 140 return new_window_delegate_.get(); | 145 return new_window_delegate_.get(); |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 462 static WmShell* instance_; | 467 static WmShell* instance_; |
| 463 | 468 |
| 464 base::ObserverList<ShellObserver> shell_observers_; | 469 base::ObserverList<ShellObserver> shell_observers_; |
| 465 std::unique_ptr<ShellDelegate> delegate_; | 470 std::unique_ptr<ShellDelegate> delegate_; |
| 466 | 471 |
| 467 std::unique_ptr<AcceleratorController> accelerator_controller_; | 472 std::unique_ptr<AcceleratorController> accelerator_controller_; |
| 468 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; | 473 std::unique_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 469 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; | 474 std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_; |
| 470 std::unique_ptr<FocusCycler> focus_cycler_; | 475 std::unique_ptr<FocusCycler> focus_cycler_; |
| 471 std::unique_ptr<ImmersiveContextAsh> immersive_context_; | 476 std::unique_ptr<ImmersiveContextAsh> immersive_context_; |
| 477 std::unique_ptr<LocaleNotificationController> locale_notification_controller_; | |
|
msw
2016/10/14 01:46:29
nit: abc order (after KeyboardUI)
| |
| 472 std::unique_ptr<KeyboardBrightnessControlDelegate> | 478 std::unique_ptr<KeyboardBrightnessControlDelegate> |
| 473 keyboard_brightness_control_delegate_; | 479 keyboard_brightness_control_delegate_; |
| 474 std::unique_ptr<KeyboardUI> keyboard_ui_; | 480 std::unique_ptr<KeyboardUI> keyboard_ui_; |
| 475 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; | 481 std::unique_ptr<MaximizeModeController> maximize_mode_controller_; |
| 476 std::unique_ptr<MediaDelegate> media_delegate_; | 482 std::unique_ptr<MediaDelegate> media_delegate_; |
| 477 std::unique_ptr<MruWindowTracker> mru_window_tracker_; | 483 std::unique_ptr<MruWindowTracker> mru_window_tracker_; |
| 478 std::unique_ptr<NewWindowDelegate> new_window_delegate_; | 484 std::unique_ptr<NewWindowDelegate> new_window_delegate_; |
| 479 std::unique_ptr<PaletteDelegate> palette_delegate_; | 485 std::unique_ptr<PaletteDelegate> palette_delegate_; |
| 480 std::unique_ptr<ShelfController> shelf_controller_; | 486 std::unique_ptr<ShelfController> shelf_controller_; |
| 481 std::unique_ptr<ShelfDelegate> shelf_delegate_; | 487 std::unique_ptr<ShelfDelegate> shelf_delegate_; |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 500 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; | 506 scoped_refptr<base::SequencedWorkerPool> blocking_pool_; |
| 501 | 507 |
| 502 #if defined(OS_CHROMEOS) | 508 #if defined(OS_CHROMEOS) |
| 503 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; | 509 std::unique_ptr<LogoutConfirmationController> logout_confirmation_controller_; |
| 504 #endif | 510 #endif |
| 505 }; | 511 }; |
| 506 | 512 |
| 507 } // namespace ash | 513 } // namespace ash |
| 508 | 514 |
| 509 #endif // ASH_COMMON_WM_SHELL_H_ | 515 #endif // ASH_COMMON_WM_SHELL_H_ |
| OLD | NEW |