| 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 class NonClientFrameView; | 62 class NonClientFrameView; |
| 63 class Widget; | 63 class Widget; |
| 64 namespace corewm { | 64 namespace corewm { |
| 65 class TooltipController; | 65 class TooltipController; |
| 66 } | 66 } |
| 67 } | 67 } |
| 68 | 68 |
| 69 namespace wm { | 69 namespace wm { |
| 70 class AcceleratorFilter; | 70 class AcceleratorFilter; |
| 71 class CompoundEventFilter; | 71 class CompoundEventFilter; |
| 72 class NestedAcceleratorController; | |
| 73 class ShadowController; | 72 class ShadowController; |
| 74 class VisibilityController; | 73 class VisibilityController; |
| 75 class WindowModalityController; | 74 class WindowModalityController; |
| 76 } | 75 } |
| 77 | 76 |
| 78 namespace ash { | 77 namespace ash { |
| 79 | 78 |
| 80 class AcceleratorController; | 79 class AcceleratorController; |
| 81 class AccessibilityDelegate; | 80 class AccessibilityDelegate; |
| 82 class AppListController; | 81 class AppListController; |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 // |target_root_window_| never becomes NULL during the session. | 633 // |target_root_window_| never becomes NULL during the session. |
| 635 aura::Window* target_root_window_; | 634 aura::Window* target_root_window_; |
| 636 aura::Window* scoped_target_root_window_; | 635 aura::Window* scoped_target_root_window_; |
| 637 | 636 |
| 638 // The CompoundEventFilter owned by aura::Env object. | 637 // The CompoundEventFilter owned by aura::Env object. |
| 639 scoped_ptr< ::wm::CompoundEventFilter> env_filter_; | 638 scoped_ptr< ::wm::CompoundEventFilter> env_filter_; |
| 640 | 639 |
| 641 std::vector<WindowAndBoundsPair> to_restore_; | 640 std::vector<WindowAndBoundsPair> to_restore_; |
| 642 | 641 |
| 643 scoped_ptr<UserMetricsRecorder> user_metrics_recorder_; | 642 scoped_ptr<UserMetricsRecorder> user_metrics_recorder_; |
| 644 scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_; | |
| 645 scoped_ptr<AcceleratorController> accelerator_controller_; | 643 scoped_ptr<AcceleratorController> accelerator_controller_; |
| 646 scoped_ptr<ShellDelegate> delegate_; | 644 scoped_ptr<ShellDelegate> delegate_; |
| 647 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; | 645 scoped_ptr<SystemTrayDelegate> system_tray_delegate_; |
| 648 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; | 646 scoped_ptr<SystemTrayNotifier> system_tray_notifier_; |
| 649 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; | 647 scoped_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; |
| 650 scoped_ptr<SessionStateDelegate> session_state_delegate_; | 648 scoped_ptr<SessionStateDelegate> session_state_delegate_; |
| 651 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; | 649 scoped_ptr<AccessibilityDelegate> accessibility_delegate_; |
| 652 scoped_ptr<NewWindowDelegate> new_window_delegate_; | 650 scoped_ptr<NewWindowDelegate> new_window_delegate_; |
| 653 scoped_ptr<MediaDelegate> media_delegate_; | 651 scoped_ptr<MediaDelegate> media_delegate_; |
| 654 scoped_ptr<ShelfDelegate> shelf_delegate_; | 652 scoped_ptr<ShelfDelegate> shelf_delegate_; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 767 scoped_ptr<GPUSupport> gpu_support_; | 765 scoped_ptr<GPUSupport> gpu_support_; |
| 768 | 766 |
| 769 base::SequencedWorkerPool* blocking_pool_; | 767 base::SequencedWorkerPool* blocking_pool_; |
| 770 | 768 |
| 771 DISALLOW_COPY_AND_ASSIGN(Shell); | 769 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 772 }; | 770 }; |
| 773 | 771 |
| 774 } // namespace ash | 772 } // namespace ash |
| 775 | 773 |
| 776 #endif // ASH_SHELL_H_ | 774 #endif // ASH_SHELL_H_ |
| OLD | NEW |