| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 namespace corewm { | 57 namespace corewm { |
| 58 class CompoundEventFilter; | 58 class CompoundEventFilter; |
| 59 class InputMethodEventFilter; | 59 class InputMethodEventFilter; |
| 60 class ShadowController; | 60 class ShadowController; |
| 61 class TooltipController; | 61 class TooltipController; |
| 62 class VisibilityController; | 62 class VisibilityController; |
| 63 class WindowModalityController; | 63 class WindowModalityController; |
| 64 } | 64 } |
| 65 } | 65 } |
| 66 | 66 |
| 67 namespace message_center { | |
| 68 class MessageCenter; | |
| 69 } | |
| 70 | |
| 71 namespace ash { | 67 namespace ash { |
| 72 | 68 |
| 73 class AcceleratorController; | 69 class AcceleratorController; |
| 74 class AshNativeCursorManager; | 70 class AshNativeCursorManager; |
| 75 class CapsLockDelegate; | 71 class CapsLockDelegate; |
| 76 class DesktopBackgroundController; | 72 class DesktopBackgroundController; |
| 77 class DisplayController; | 73 class DisplayController; |
| 78 class HighContrastController; | 74 class HighContrastController; |
| 79 class Launcher; | 75 class Launcher; |
| 80 class LauncherDelegate; | 76 class LauncherDelegate; |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 } | 433 } |
| 438 internal::DisplayErrorObserver* display_error_observer() { | 434 internal::DisplayErrorObserver* display_error_observer() { |
| 439 return display_error_observer_.get(); | 435 return display_error_observer_.get(); |
| 440 } | 436 } |
| 441 #endif // defined(OS_CHROMEOS) | 437 #endif // defined(OS_CHROMEOS) |
| 442 | 438 |
| 443 RootWindowHostFactory* root_window_host_factory() { | 439 RootWindowHostFactory* root_window_host_factory() { |
| 444 return root_window_host_factory_.get(); | 440 return root_window_host_factory_.get(); |
| 445 } | 441 } |
| 446 | 442 |
| 447 // MessageCenter is a global list of currently displayed notifications. | |
| 448 message_center::MessageCenter* message_center(); | |
| 449 | |
| 450 private: | 443 private: |
| 451 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); | 444 FRIEND_TEST_ALL_PREFIXES(ExtendedDesktopTest, TestCursor); |
| 452 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); | 445 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, MouseEventCursors); |
| 453 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); | 446 FRIEND_TEST_ALL_PREFIXES(WindowManagerTest, TransformActivate); |
| 454 friend class internal::RootWindowController; | 447 friend class internal::RootWindowController; |
| 455 friend class test::ShellTestApi; | 448 friend class test::ShellTestApi; |
| 456 friend class shell::WindowWatcher; | 449 friend class shell::WindowWatcher; |
| 457 | 450 |
| 458 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; | 451 typedef std::pair<aura::Window*, gfx::Rect> WindowAndBoundsPair; |
| 459 | 452 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 // Controls video output device state. | 575 // Controls video output device state. |
| 583 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; | 576 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; |
| 584 scoped_ptr<internal::OutputConfiguratorAnimation> | 577 scoped_ptr<internal::OutputConfiguratorAnimation> |
| 585 output_configurator_animation_; | 578 output_configurator_animation_; |
| 586 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; | 579 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; |
| 587 | 580 |
| 588 // Receives output change events and udpates the display manager. | 581 // Receives output change events and udpates the display manager. |
| 589 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; | 582 scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_; |
| 590 #endif // defined(OS_CHROMEOS) | 583 #endif // defined(OS_CHROMEOS) |
| 591 | 584 |
| 592 scoped_ptr<message_center::MessageCenter> message_center_; | |
| 593 | |
| 594 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a | 585 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |
| 595 // pointer to vend to test code. | 586 // pointer to vend to test code. |
| 596 AshNativeCursorManager* native_cursor_manager_; | 587 AshNativeCursorManager* native_cursor_manager_; |
| 597 views::corewm::CursorManager cursor_manager_; | 588 views::corewm::CursorManager cursor_manager_; |
| 598 | 589 |
| 599 ObserverList<ShellObserver> observers_; | 590 ObserverList<ShellObserver> observers_; |
| 600 | 591 |
| 601 // Used by ash/shell. | 592 // Used by ash/shell. |
| 602 content::BrowserContext* browser_context_; | 593 content::BrowserContext* browser_context_; |
| 603 | 594 |
| 604 // For testing only: simulate that a modal window is open | 595 // For testing only: simulate that a modal window is open |
| 605 bool simulate_modal_window_open_for_testing_; | 596 bool simulate_modal_window_open_for_testing_; |
| 606 | 597 |
| 607 DISALLOW_COPY_AND_ASSIGN(Shell); | 598 DISALLOW_COPY_AND_ASSIGN(Shell); |
| 608 }; | 599 }; |
| 609 | 600 |
| 610 } // namespace ash | 601 } // namespace ash |
| 611 | 602 |
| 612 #endif // ASH_SHELL_H_ | 603 #endif // ASH_SHELL_H_ |
| OLD | NEW |