| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_SHELL_H_ | 5 #ifndef ASH_SHELL_H_ |
| 6 #define ASH_SHELL_H_ | 6 #define ASH_SHELL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 class FirstRunHelper; | 95 class FirstRunHelper; |
| 96 class GPUSupport; | 96 class GPUSupport; |
| 97 class HighContrastController; | 97 class HighContrastController; |
| 98 class KeyboardUMAEventFilter; | 98 class KeyboardUMAEventFilter; |
| 99 class LinkHandlerModelFactory; | 99 class LinkHandlerModelFactory; |
| 100 class LocaleNotificationController; | 100 class LocaleNotificationController; |
| 101 class LockStateController; | 101 class LockStateController; |
| 102 enum class LoginStatus; | 102 enum class LoginStatus; |
| 103 class MagnificationController; | 103 class MagnificationController; |
| 104 class MouseCursorEventFilter; | 104 class MouseCursorEventFilter; |
| 105 class NewWindowDelegate; | |
| 106 class OverlayEventFilter; | 105 class OverlayEventFilter; |
| 107 class PartialMagnificationController; | 106 class PartialMagnificationController; |
| 108 class PointerWatcherDelegate; | 107 class PointerWatcherDelegate; |
| 109 class PowerButtonController; | 108 class PowerButtonController; |
| 110 class PowerEventObserver; | 109 class PowerEventObserver; |
| 111 class ProjectingObserver; | 110 class ProjectingObserver; |
| 112 class ResizeShadowController; | 111 class ResizeShadowController; |
| 113 class ResolutionNotificationController; | 112 class ResolutionNotificationController; |
| 114 class RootWindowController; | 113 class RootWindowController; |
| 115 class ScopedOverviewAnimationSettingsFactoryAura; | 114 class ScopedOverviewAnimationSettingsFactoryAura; |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } | 335 ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } |
| 337 | 336 |
| 338 UserWallpaperDelegate* user_wallpaper_delegate() { | 337 UserWallpaperDelegate* user_wallpaper_delegate() { |
| 339 return user_wallpaper_delegate_.get(); | 338 return user_wallpaper_delegate_.get(); |
| 340 } | 339 } |
| 341 | 340 |
| 342 SessionStateDelegate* session_state_delegate() { | 341 SessionStateDelegate* session_state_delegate() { |
| 343 return session_state_delegate_.get(); | 342 return session_state_delegate_.get(); |
| 344 } | 343 } |
| 345 | 344 |
| 346 NewWindowDelegate* new_window_delegate() { | |
| 347 return new_window_delegate_.get(); | |
| 348 } | |
| 349 | |
| 350 HighContrastController* high_contrast_controller() { | 345 HighContrastController* high_contrast_controller() { |
| 351 return high_contrast_controller_.get(); | 346 return high_contrast_controller_.get(); |
| 352 } | 347 } |
| 353 | 348 |
| 354 MagnificationController* magnification_controller() { | 349 MagnificationController* magnification_controller() { |
| 355 return magnification_controller_.get(); | 350 return magnification_controller_.get(); |
| 356 } | 351 } |
| 357 | 352 |
| 358 PartialMagnificationController* partial_magnification_controller() { | 353 PartialMagnificationController* partial_magnification_controller() { |
| 359 return partial_magnification_controller_.get(); | 354 return partial_magnification_controller_.get(); |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 // The CompoundEventFilter owned by aura::Env object. | 537 // The CompoundEventFilter owned by aura::Env object. |
| 543 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; | 538 std::unique_ptr<::wm::CompoundEventFilter> env_filter_; |
| 544 | 539 |
| 545 std::vector<WindowAndBoundsPair> to_restore_; | 540 std::vector<WindowAndBoundsPair> to_restore_; |
| 546 | 541 |
| 547 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; | 542 std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; |
| 548 std::unique_ptr<AcceleratorControllerDelegateAura> | 543 std::unique_ptr<AcceleratorControllerDelegateAura> |
| 549 accelerator_controller_delegate_; | 544 accelerator_controller_delegate_; |
| 550 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; | 545 std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; |
| 551 std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 546 std::unique_ptr<SessionStateDelegate> session_state_delegate_; |
| 552 std::unique_ptr<NewWindowDelegate> new_window_delegate_; | |
| 553 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; | 547 std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_; |
| 554 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; | 548 std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_; |
| 555 std::unique_ptr<WindowPositioner> window_positioner_; | 549 std::unique_ptr<WindowPositioner> window_positioner_; |
| 556 | 550 |
| 557 std::unique_ptr<DragDropController> drag_drop_controller_; | 551 std::unique_ptr<DragDropController> drag_drop_controller_; |
| 558 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; | 552 std::unique_ptr<ResizeShadowController> resize_shadow_controller_; |
| 559 std::unique_ptr<::wm::ShadowController> shadow_controller_; | 553 std::unique_ptr<::wm::ShadowController> shadow_controller_; |
| 560 std::unique_ptr<::wm::VisibilityController> visibility_controller_; | 554 std::unique_ptr<::wm::VisibilityController> visibility_controller_; |
| 561 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; | 555 std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; |
| 562 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; | 556 std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 base::SequencedWorkerPool* blocking_pool_; | 649 base::SequencedWorkerPool* blocking_pool_; |
| 656 | 650 |
| 657 bool in_mus_ = false; | 651 bool in_mus_ = false; |
| 658 | 652 |
| 659 DISALLOW_COPY_AND_ASSIGN(Shell); | 653 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 660 }; | 654 }; |
| 661 | 655 |
| 662 } // namespace ash | 656 } // namespace ash |
| 663 | 657 |
| 664 #endif // ASH_SHELL_H_ | 658 #endif // ASH_SHELL_H_ |
| OLD | NEW |