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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 class AppListController; | 83 class AppListController; |
84 class CaptureController; | 84 class CaptureController; |
85 class DragDropController; | 85 class DragDropController; |
86 class EventClientImpl; | 86 class EventClientImpl; |
87 class EventRewriterEventFilter; | 87 class EventRewriterEventFilter; |
88 class FocusCycler; | 88 class FocusCycler; |
89 class MagnificationController; | 89 class MagnificationController; |
90 class MouseCursorEventFilter; | 90 class MouseCursorEventFilter; |
91 class OutputConfiguratorAnimation; | 91 class OutputConfiguratorAnimation; |
92 class OverlayEventFilter; | 92 class OverlayEventFilter; |
93 class PartialMagnificationController; | |
93 class ResizeShadowController; | 94 class ResizeShadowController; |
94 class RootWindowController; | 95 class RootWindowController; |
95 class RootWindowLayoutManager; | 96 class RootWindowLayoutManager; |
96 class ScreenPositionController; | 97 class ScreenPositionController; |
97 class ShadowController; | 98 class ShadowController; |
98 class ShelfLayoutManager; | 99 class ShelfLayoutManager; |
99 class SlowAnimationEventFilter; | 100 class SlowAnimationEventFilter; |
100 class StackingController; | 101 class StackingController; |
101 class StatusAreaWidget; | 102 class StatusAreaWidget; |
102 class SystemGestureEventFilter; | 103 class SystemGestureEventFilter; |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
304 } | 305 } |
305 | 306 |
306 HighContrastController* high_contrast_controller() { | 307 HighContrastController* high_contrast_controller() { |
307 return high_contrast_controller_.get(); | 308 return high_contrast_controller_.get(); |
308 } | 309 } |
309 | 310 |
310 internal::MagnificationController* magnification_controller() { | 311 internal::MagnificationController* magnification_controller() { |
311 return magnification_controller_.get(); | 312 return magnification_controller_.get(); |
312 } | 313 } |
313 | 314 |
315 internal::PartialMagnificationController* partial_magnification_controller() { | |
316 return partial_magnification_controller_.get(); | |
317 } | |
318 | |
314 // TODO(oshima): Remove methods that are moved to RootWindowController. | 319 // TODO(oshima): Remove methods that are moved to RootWindowController. |
315 Launcher* launcher(); | 320 Launcher* launcher(); |
316 | 321 |
317 const ScreenAsh* screen() { return screen_.get(); } | 322 const ScreenAsh* screen() { return screen_.get(); } |
318 | 323 |
319 // Force the shelf to query for it's current visibility state. | 324 // Force the shelf to query for it's current visibility state. |
320 void UpdateShelfVisibility(); | 325 void UpdateShelfVisibility(); |
321 | 326 |
322 // Sets/gets the shelf auto-hide behavior. | 327 // Sets/gets the shelf auto-hide behavior. |
323 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior); | 328 void SetShelfAutoHideBehavior(ShelfAutoHideBehavior behavior); |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
444 scoped_ptr<internal::VisibilityController> visibility_controller_; | 449 scoped_ptr<internal::VisibilityController> visibility_controller_; |
445 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; | 450 scoped_ptr<DesktopBackgroundController> desktop_background_controller_; |
446 scoped_ptr<PowerButtonController> power_button_controller_; | 451 scoped_ptr<PowerButtonController> power_button_controller_; |
447 scoped_ptr<UserActivityDetector> user_activity_detector_; | 452 scoped_ptr<UserActivityDetector> user_activity_detector_; |
448 scoped_ptr<VideoDetector> video_detector_; | 453 scoped_ptr<VideoDetector> video_detector_; |
449 scoped_ptr<WindowCycleController> window_cycle_controller_; | 454 scoped_ptr<WindowCycleController> window_cycle_controller_; |
450 scoped_ptr<internal::FocusCycler> focus_cycler_; | 455 scoped_ptr<internal::FocusCycler> focus_cycler_; |
451 scoped_ptr<DisplayController> display_controller_; | 456 scoped_ptr<DisplayController> display_controller_; |
452 scoped_ptr<HighContrastController> high_contrast_controller_; | 457 scoped_ptr<HighContrastController> high_contrast_controller_; |
453 scoped_ptr<internal::MagnificationController> magnification_controller_; | 458 scoped_ptr<internal::MagnificationController> magnification_controller_; |
459 scoped_ptr<internal::PartialMagnificationController> | |
sky
2012/10/16 16:29:22
Don't expose classes in the internal namespace tha
Zachary Kuznia
2012/11/12 08:43:46
Done.
| |
460 partial_magnification_controller_; | |
454 scoped_ptr<aura::FocusManager> focus_manager_; | 461 scoped_ptr<aura::FocusManager> focus_manager_; |
455 scoped_ptr<aura::client::UserActionClient> user_action_client_; | 462 scoped_ptr<aura::client::UserActionClient> user_action_client_; |
456 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; | 463 scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; |
457 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; | 464 scoped_ptr<internal::ScreenPositionController> screen_position_controller_; |
458 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; | 465 scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; |
459 scoped_ptr<internal::EventClientImpl> event_client_; | 466 scoped_ptr<internal::EventClientImpl> event_client_; |
460 | 467 |
461 // An event filter that rewrites or drops an event. | 468 // An event filter that rewrites or drops an event. |
462 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; | 469 scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; |
463 | 470 |
(...skipping 29 matching lines...) Expand all Loading... | |
493 | 500 |
494 // Used by ash/shell. | 501 // Used by ash/shell. |
495 content::BrowserContext* browser_context_; | 502 content::BrowserContext* browser_context_; |
496 | 503 |
497 DISALLOW_COPY_AND_ASSIGN(Shell); | 504 DISALLOW_COPY_AND_ASSIGN(Shell); |
498 }; | 505 }; |
499 | 506 |
500 } // namespace ash | 507 } // namespace ash |
501 | 508 |
502 #endif // ASH_SHELL_H_ | 509 #endif // ASH_SHELL_H_ |
OLD | NEW |