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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 class AcceleratorFilter; | 78 class AcceleratorFilter; |
79 class ActivationController; | 79 class ActivationController; |
80 class AppListController; | 80 class AppListController; |
81 class CaptureController; | 81 class CaptureController; |
82 class DisplayController; | 82 class DisplayController; |
83 class DragDropController; | 83 class DragDropController; |
84 class EventRewriterEventFilter; | 84 class EventRewriterEventFilter; |
85 class FocusCycler; | 85 class FocusCycler; |
86 class MagnificationController; | 86 class MagnificationController; |
87 class MouseCursorEventFilter; | 87 class MouseCursorEventFilter; |
| 88 class OutputConfiguratorAnimation; |
88 class OverlayEventFilter; | 89 class OverlayEventFilter; |
89 class PanelLayoutManager; | 90 class PanelLayoutManager; |
90 class ResizeShadowController; | 91 class ResizeShadowController; |
91 class RootWindowController; | 92 class RootWindowController; |
92 class RootWindowLayoutManager; | 93 class RootWindowLayoutManager; |
93 class ScreenPositionController; | 94 class ScreenPositionController; |
94 class ShadowController; | 95 class ShadowController; |
95 class ShelfLayoutManager; | 96 class ShelfLayoutManager; |
96 class ShellContextMenu; | 97 class ShellContextMenu; |
97 class SlowAnimationEventFilter; | 98 class SlowAnimationEventFilter; |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
351 browser_context_ = browser_context; | 352 browser_context_ = browser_context; |
352 } | 353 } |
353 | 354 |
354 // Initializes the root window to be used for a secondary display. | 355 // Initializes the root window to be used for a secondary display. |
355 void InitRootWindowForSecondaryDisplay(aura::RootWindow* root); | 356 void InitRootWindowForSecondaryDisplay(aura::RootWindow* root); |
356 | 357 |
357 #if defined(OS_CHROMEOS) | 358 #if defined(OS_CHROMEOS) |
358 chromeos::OutputConfigurator* output_configurator() { | 359 chromeos::OutputConfigurator* output_configurator() { |
359 return output_configurator_.get(); | 360 return output_configurator_.get(); |
360 } | 361 } |
| 362 internal::OutputConfiguratorAnimation* output_configurator_animation() { |
| 363 return output_configurator_animation_.get(); |
| 364 } |
361 #endif // defined(OS_CHROMEOS) | 365 #endif // defined(OS_CHROMEOS) |
362 | 366 |
363 private: | 367 private: |
364 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); | 368 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); |
365 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); | 369 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); |
366 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); | 370 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); |
367 friend class internal::RootWindowController; | 371 friend class internal::RootWindowController; |
368 | 372 |
369 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; | 373 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |
370 | 374 |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
460 // An event filter that pre-handles all key events to send them to an IME. | 464 // An event filter that pre-handles all key events to send them to an IME. |
461 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; | 465 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; |
462 | 466 |
463 // An event filter that silently keeps track of all touch events and controls | 467 // An event filter that silently keeps track of all touch events and controls |
464 // a heads-up display. This is enabled only if --ash-touch-hud flag is used. | 468 // a heads-up display. This is enabled only if --ash-touch-hud flag is used. |
465 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; | 469 scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_; |
466 | 470 |
467 #if defined(OS_CHROMEOS) | 471 #if defined(OS_CHROMEOS) |
468 // Controls video output device state. | 472 // Controls video output device state. |
469 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; | 473 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; |
| 474 scoped_ptr<internal::OutputConfiguratorAnimation> |
| 475 output_configurator_animation_; |
470 #endif // defined(OS_CHROMEOS) | 476 #endif // defined(OS_CHROMEOS) |
471 | 477 |
472 CursorManager cursor_manager_; | 478 CursorManager cursor_manager_; |
473 | 479 |
474 // The shelf for managing the launcher and the status widget in non-compact | 480 // The shelf for managing the launcher and the status widget in non-compact |
475 // mode. Shell does not own the shelf. Instead, it is owned by container of | 481 // mode. Shell does not own the shelf. Instead, it is owned by container of |
476 // the status area. | 482 // the status area. |
477 internal::ShelfLayoutManager* shelf_; | 483 internal::ShelfLayoutManager* shelf_; |
478 | 484 |
479 // Manages layout of panels. Owned by PanelContainer. | 485 // Manages layout of panels. Owned by PanelContainer. |
480 internal::PanelLayoutManager* panel_layout_manager_; | 486 internal::PanelLayoutManager* panel_layout_manager_; |
481 | 487 |
482 ObserverList<ShellObserver> observers_; | 488 ObserverList<ShellObserver> observers_; |
483 | 489 |
484 // Widget containing system tray. | 490 // Widget containing system tray. |
485 internal::StatusAreaWidget* status_area_widget_; | 491 internal::StatusAreaWidget* status_area_widget_; |
486 | 492 |
487 // Used by ash/shell. | 493 // Used by ash/shell. |
488 content::BrowserContext* browser_context_; | 494 content::BrowserContext* browser_context_; |
489 | 495 |
490 DISALLOW_COPY_AND_ASSIGN(Shell); | 496 DISALLOW_COPY_AND_ASSIGN(Shell); |
491 }; | 497 }; |
492 | 498 |
493 } // namespace ash | 499 } // namespace ash |
494 | 500 |
495 #endif // ASH_SHELL_H_ | 501 #endif // ASH_SHELL_H_ |
OLD | NEW |