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 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
492 // TODO(oshima): Move these objects to DisplayController. | 492 // TODO(oshima): Move these objects to DisplayController. |
493 chromeos::OutputConfigurator* output_configurator() { | 493 chromeos::OutputConfigurator* output_configurator() { |
494 return output_configurator_.get(); | 494 return output_configurator_.get(); |
495 } | 495 } |
496 internal::OutputConfiguratorAnimation* output_configurator_animation() { | 496 internal::OutputConfiguratorAnimation* output_configurator_animation() { |
497 return output_configurator_animation_.get(); | 497 return output_configurator_animation_.get(); |
498 } | 498 } |
499 internal::DisplayErrorObserver* display_error_observer() { | 499 internal::DisplayErrorObserver* display_error_observer() { |
500 return display_error_observer_.get(); | 500 return display_error_observer_.get(); |
501 } | 501 } |
502 | |
503 // Toggles cursor compositing on/off. Native cursor is disabled when cursor | |
504 // compositing is enabled, and vice versa. | |
505 void SetCursorCompositingEnabled(bool enabled); | |
506 bool is_cursor_compositing_enabled() const { | |
507 return is_cursor_compositing_enabled_; | |
508 } | |
502 #endif // defined(USE_X11) | 509 #endif // defined(USE_X11) |
503 | 510 |
504 internal::ResolutionNotificationController* | 511 internal::ResolutionNotificationController* |
505 resolution_notification_controller() { | 512 resolution_notification_controller() { |
506 return resolution_notification_controller_.get(); | 513 return resolution_notification_controller_.get(); |
507 } | 514 } |
508 #endif // defined(OS_CHROMEOS) | 515 #endif // defined(OS_CHROMEOS) |
509 | 516 |
510 WindowTreeHostFactory* root_window_host_factory() { | 517 WindowTreeHostFactory* root_window_host_factory() { |
511 return root_window_host_factory_.get(); | 518 return root_window_host_factory_.get(); |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
691 resolution_notification_controller_; | 698 resolution_notification_controller_; |
692 #if defined(USE_X11) | 699 #if defined(USE_X11) |
693 // Controls video output device state. | 700 // Controls video output device state. |
694 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; | 701 scoped_ptr<chromeos::OutputConfigurator> output_configurator_; |
695 scoped_ptr<internal::OutputConfiguratorAnimation> | 702 scoped_ptr<internal::OutputConfiguratorAnimation> |
696 output_configurator_animation_; | 703 output_configurator_animation_; |
697 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; | 704 scoped_ptr<internal::DisplayErrorObserver> display_error_observer_; |
698 | 705 |
699 // Listens for output changes and updates the display manager. | 706 // Listens for output changes and updates the display manager. |
700 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_; | 707 scoped_ptr<internal::DisplayChangeObserver> display_change_observer_; |
708 | |
709 bool is_cursor_compositing_enabled_; | |
oshima
2014/02/05 21:49:59
can we simply use one in CursorWindowController?
hshi1
2014/02/05 22:55:58
Done.
| |
701 #endif // defined(USE_X11) | 710 #endif // defined(USE_X11) |
702 #endif // defined(OS_CHROMEOS) | 711 #endif // defined(OS_CHROMEOS) |
703 | 712 |
704 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a | 713 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a |
705 // pointer to vend to test code. | 714 // pointer to vend to test code. |
706 AshNativeCursorManager* native_cursor_manager_; | 715 AshNativeCursorManager* native_cursor_manager_; |
707 views::corewm::CursorManager cursor_manager_; | 716 views::corewm::CursorManager cursor_manager_; |
708 | 717 |
709 ObserverList<ShellObserver> observers_; | 718 ObserverList<ShellObserver> observers_; |
710 | 719 |
711 // For testing only: simulate that a modal window is open | 720 // For testing only: simulate that a modal window is open |
712 bool simulate_modal_window_open_for_testing_; | 721 bool simulate_modal_window_open_for_testing_; |
713 | 722 |
714 bool is_touch_hud_projection_enabled_; | 723 bool is_touch_hud_projection_enabled_; |
715 | 724 |
716 // Injected content::GPUDataManager support. | 725 // Injected content::GPUDataManager support. |
717 scoped_ptr<GPUSupport> gpu_support_; | 726 scoped_ptr<GPUSupport> gpu_support_; |
718 | 727 |
719 DISALLOW_COPY_AND_ASSIGN(Shell); | 728 DISALLOW_COPY_AND_ASSIGN(Shell); |
720 }; | 729 }; |
721 | 730 |
722 } // namespace ash | 731 } // namespace ash |
723 | 732 |
724 #endif // ASH_SHELL_H_ | 733 #endif // ASH_SHELL_H_ |
OLD | NEW |