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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
692 // An event filter which handles system level gestures | 692 // An event filter which handles system level gestures |
693 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; | 693 scoped_ptr<SystemGestureEventFilter> system_gesture_filter_; |
694 | 694 |
695 // An event filter that pre-handles global accelerators. | 695 // An event filter that pre-handles global accelerators. |
696 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; | 696 scoped_ptr< ::wm::AcceleratorFilter> accelerator_filter_; |
697 | 697 |
698 // An event filter that pre-handles all key events to send them to an IME. | 698 // An event filter that pre-handles all key events to send them to an IME. |
699 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; | 699 scoped_ptr< ::wm::InputMethodEventFilter> input_method_filter_; |
700 | 700 |
701 scoped_ptr<DisplayManager> display_manager_; | 701 scoped_ptr<DisplayManager> display_manager_; |
702 scoped_ptr<base::WeakPtrFactory<DisplayManager> > | |
703 weak_display_manager_factory_; | |
oshima
2014/08/26 15:31:05
This is for display_manager_, and defined after di
dmichael (off chromium)
2014/08/26 15:34:52
It should be safe this way, and I think the Clang
Anand Ratn (left samsung)
2014/08/28 06:15:07
Done.
Anand Ratn (left samsung)
2014/08/28 06:15:07
Maintaining the order of display_manager_ in the n
| |
704 | 702 |
705 scoped_ptr<LocaleNotificationController> locale_notification_controller_; | 703 scoped_ptr<LocaleNotificationController> locale_notification_controller_; |
706 | 704 |
707 scoped_ptr<AccelerometerController> accelerometer_controller_; | 705 scoped_ptr<AccelerometerController> accelerometer_controller_; |
708 | 706 |
709 #if defined(OS_CHROMEOS) | 707 #if defined(OS_CHROMEOS) |
710 scoped_ptr<PowerEventObserver> power_event_observer_; | 708 scoped_ptr<PowerEventObserver> power_event_observer_; |
711 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; | 709 scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; |
712 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; | 710 scoped_ptr<VideoActivityNotifier> video_activity_notifier_; |
713 scoped_ptr<StickyKeysController> sticky_keys_controller_; | 711 scoped_ptr<StickyKeysController> sticky_keys_controller_; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
751 ObserverList<ShellObserver> observers_; | 749 ObserverList<ShellObserver> observers_; |
752 | 750 |
753 // For testing only: simulate that a modal window is open | 751 // For testing only: simulate that a modal window is open |
754 bool simulate_modal_window_open_for_testing_; | 752 bool simulate_modal_window_open_for_testing_; |
755 | 753 |
756 bool is_touch_hud_projection_enabled_; | 754 bool is_touch_hud_projection_enabled_; |
757 | 755 |
758 // Injected content::GPUDataManager support. | 756 // Injected content::GPUDataManager support. |
759 scoped_ptr<GPUSupport> gpu_support_; | 757 scoped_ptr<GPUSupport> gpu_support_; |
760 | 758 |
759 scoped_ptr<base::WeakPtrFactory<DisplayManager> > | |
760 weak_display_manager_factory_; | |
761 | |
761 DISALLOW_COPY_AND_ASSIGN(Shell); | 762 DISALLOW_COPY_AND_ASSIGN(Shell); |
762 }; | 763 }; |
763 | 764 |
764 } // namespace ash | 765 } // namespace ash |
765 | 766 |
766 #endif // ASH_SHELL_H_ | 767 #endif // ASH_SHELL_H_ |
OLD | NEW |