| 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 119 struct ShellInitParams; | 119 struct ShellInitParams; | 
| 120 class SlowAnimationEventFilter; | 120 class SlowAnimationEventFilter; | 
| 121 class StatusAreaWidget; | 121 class StatusAreaWidget; | 
| 122 class StickyKeysController; | 122 class StickyKeysController; | 
| 123 class SystemGestureEventFilter; | 123 class SystemGestureEventFilter; | 
| 124 class SystemModalContainerEventFilter; | 124 class SystemModalContainerEventFilter; | 
| 125 class SystemTray; | 125 class SystemTray; | 
| 126 class ToplevelWindowEventHandler; | 126 class ToplevelWindowEventHandler; | 
| 127 class TouchTransformerController; | 127 class TouchTransformerController; | 
| 128 class TouchObserverHUD; | 128 class TouchObserverHUD; | 
| 129 class UserWallpaperDelegate; |  | 
| 130 class VirtualKeyboardController; | 129 class VirtualKeyboardController; | 
| 131 class VideoActivityNotifier; | 130 class VideoActivityNotifier; | 
| 132 class VideoDetector; | 131 class VideoDetector; | 
| 133 class WebNotificationTray; | 132 class WebNotificationTray; | 
| 134 class WindowPositioner; | 133 class WindowPositioner; | 
| 135 class WmShellAura; | 134 class WmShellAura; | 
| 136 class WmWindow; | 135 class WmWindow; | 
| 137 | 136 | 
| 138 namespace shell { | 137 namespace shell { | 
| 139 class WindowWatcher; | 138 class WindowWatcher; | 
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 307     return screenshot_controller_.get(); | 306     return screenshot_controller_.get(); | 
| 308   } | 307   } | 
| 309   MouseCursorEventFilter* mouse_cursor_filter() { | 308   MouseCursorEventFilter* mouse_cursor_filter() { | 
| 310     return mouse_cursor_filter_.get(); | 309     return mouse_cursor_filter_.get(); | 
| 311   } | 310   } | 
| 312   EventTransformationHandler* event_transformation_handler() { | 311   EventTransformationHandler* event_transformation_handler() { | 
| 313     return event_transformation_handler_.get(); | 312     return event_transformation_handler_.get(); | 
| 314   } | 313   } | 
| 315   ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } | 314   ::wm::CursorManager* cursor_manager() { return cursor_manager_.get(); } | 
| 316 | 315 | 
| 317   UserWallpaperDelegate* user_wallpaper_delegate() { |  | 
| 318     return user_wallpaper_delegate_.get(); |  | 
| 319   } |  | 
| 320 |  | 
| 321   SessionStateDelegate* session_state_delegate() { | 316   SessionStateDelegate* session_state_delegate() { | 
| 322     return session_state_delegate_.get(); | 317     return session_state_delegate_.get(); | 
| 323   } | 318   } | 
| 324 | 319 | 
| 325   HighContrastController* high_contrast_controller() { | 320   HighContrastController* high_contrast_controller() { | 
| 326     return high_contrast_controller_.get(); | 321     return high_contrast_controller_.get(); | 
| 327   } | 322   } | 
| 328 | 323 | 
| 329   MagnificationController* magnification_controller() { | 324   MagnificationController* magnification_controller() { | 
| 330     return magnification_controller_.get(); | 325     return magnification_controller_.get(); | 
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 488   std::unique_ptr<WmShellAura> wm_shell_; | 483   std::unique_ptr<WmShellAura> wm_shell_; | 
| 489 | 484 | 
| 490   // The CompoundEventFilter owned by aura::Env object. | 485   // The CompoundEventFilter owned by aura::Env object. | 
| 491   std::unique_ptr<::wm::CompoundEventFilter> env_filter_; | 486   std::unique_ptr<::wm::CompoundEventFilter> env_filter_; | 
| 492 | 487 | 
| 493   std::vector<WindowAndBoundsPair> to_restore_; | 488   std::vector<WindowAndBoundsPair> to_restore_; | 
| 494 | 489 | 
| 495   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; | 490   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_; | 
| 496   std::unique_ptr<AcceleratorControllerDelegateAura> | 491   std::unique_ptr<AcceleratorControllerDelegateAura> | 
| 497       accelerator_controller_delegate_; | 492       accelerator_controller_delegate_; | 
| 498   std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_; |  | 
| 499   std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 493   std::unique_ptr<SessionStateDelegate> session_state_delegate_; | 
| 500   std::unique_ptr<WindowPositioner> window_positioner_; | 494   std::unique_ptr<WindowPositioner> window_positioner_; | 
| 501 | 495 | 
| 502   std::unique_ptr<DragDropController> drag_drop_controller_; | 496   std::unique_ptr<DragDropController> drag_drop_controller_; | 
| 503   std::unique_ptr<ResizeShadowController> resize_shadow_controller_; | 497   std::unique_ptr<ResizeShadowController> resize_shadow_controller_; | 
| 504   std::unique_ptr<::wm::ShadowController> shadow_controller_; | 498   std::unique_ptr<::wm::ShadowController> shadow_controller_; | 
| 505   std::unique_ptr<::wm::VisibilityController> visibility_controller_; | 499   std::unique_ptr<::wm::VisibilityController> visibility_controller_; | 
| 506   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; | 500   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_; | 
| 507   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; | 501   std::unique_ptr<views::corewm::TooltipController> tooltip_controller_; | 
| 508   std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; | 502   std::unique_ptr<DesktopBackgroundController> desktop_background_controller_; | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 599   base::SequencedWorkerPool* blocking_pool_; | 593   base::SequencedWorkerPool* blocking_pool_; | 
| 600 | 594 | 
| 601   bool in_mus_ = false; | 595   bool in_mus_ = false; | 
| 602 | 596 | 
| 603   DISALLOW_COPY_AND_ASSIGN(Shell); | 597   DISALLOW_COPY_AND_ASSIGN(Shell); | 
| 604 }; | 598 }; | 
| 605 | 599 | 
| 606 }  // namespace ash | 600 }  // namespace ash | 
| 607 | 601 | 
| 608 #endif  // ASH_SHELL_H_ | 602 #endif  // ASH_SHELL_H_ | 
| OLD | NEW | 
|---|