Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Side by Side Diff: ash/shell.h

Issue 2932563002: Implement cursor changing on Mushrome (Closed)
Patch Set: oshima patch take 2 Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 class VisibilityController; 82 class VisibilityController;
83 class WindowModalityController; 83 class WindowModalityController;
84 } 84 }
85 85
86 namespace ash { 86 namespace ash {
87 87
88 class AcceleratorController; 88 class AcceleratorController;
89 class AccessibilityDelegate; 89 class AccessibilityDelegate;
90 class AshDisplayController; 90 class AshDisplayController;
91 class AppListDelegateImpl; 91 class AppListDelegateImpl;
92 class AshNativeCursorManager; 92 class NativeCursorManagerAsh;
93 class AshTouchTransformController; 93 class AshTouchTransformController;
94 class AutoclickController; 94 class AutoclickController;
95 class BluetoothNotificationController; 95 class BluetoothNotificationController;
96 class BrightnessControlDelegate; 96 class BrightnessControlDelegate;
97 class CastConfigController; 97 class CastConfigController;
98 class DisplayColorManager; 98 class DisplayColorManager;
99 class DisplayConfigurationController; 99 class DisplayConfigurationController;
100 class DisplayErrorObserver; 100 class DisplayErrorObserver;
101 class DragDropController; 101 class DragDropController;
102 class EventClientImpl; 102 class EventClientImpl;
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 std::unique_ptr<AshTouchTransformController> touch_transformer_controller_; 795 std::unique_ptr<AshTouchTransformController> touch_transformer_controller_;
796 796
797 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 797 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
798 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 798 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
799 std::unique_ptr<LaserPointerController> laser_pointer_controller_; 799 std::unique_ptr<LaserPointerController> laser_pointer_controller_;
800 std::unique_ptr<PartialMagnificationController> 800 std::unique_ptr<PartialMagnificationController>
801 partial_magnification_controller_; 801 partial_magnification_controller_;
802 802
803 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a 803 // |native_cursor_manager_| is owned by |cursor_manager_|, but we keep a
804 // pointer to vend to test code. 804 // pointer to vend to test code.
805 AshNativeCursorManager* native_cursor_manager_; 805 NativeCursorManagerAsh* native_cursor_manager_;
806 806
807 // Cursor may be hidden on certain key events in Chrome OS, whereas we never 807 // Cursor may be hidden on certain key events in Chrome OS, whereas we never
808 // hide the cursor on Windows. 808 // hide the cursor on Windows.
809 std::unique_ptr<::wm::CursorManager> cursor_manager_; 809 std::unique_ptr<::wm::CursorManager> cursor_manager_;
810 810
811 // For testing only: simulate that a modal window is open 811 // For testing only: simulate that a modal window is open
812 bool simulate_modal_window_open_for_testing_; 812 bool simulate_modal_window_open_for_testing_;
813 813
814 bool is_touch_hud_projection_enabled_; 814 bool is_touch_hud_projection_enabled_;
815 815
816 // See comment for GetRootWindowForNewWindows(). 816 // See comment for GetRootWindowForNewWindows().
817 aura::Window* root_window_for_new_windows_ = nullptr; 817 aura::Window* root_window_for_new_windows_ = nullptr;
818 aura::Window* scoped_root_window_for_new_windows_ = nullptr; 818 aura::Window* scoped_root_window_for_new_windows_ = nullptr;
819 819
820 // Injected content::GPUDataManager support. 820 // Injected content::GPUDataManager support.
821 std::unique_ptr<GPUSupport> gpu_support_; 821 std::unique_ptr<GPUSupport> gpu_support_;
822 822
823 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 823 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
824 824
825 std::unique_ptr<AppListDelegateImpl> app_list_delegate_impl_; 825 std::unique_ptr<AppListDelegateImpl> app_list_delegate_impl_;
826 826
827 base::ObserverList<ShellObserver> shell_observers_; 827 base::ObserverList<ShellObserver> shell_observers_;
828 828
829 DISALLOW_COPY_AND_ASSIGN(Shell); 829 DISALLOW_COPY_AND_ASSIGN(Shell);
830 }; 830 };
831 831
832 } // namespace ash 832 } // namespace ash
833 833
834 #endif // ASH_SHELL_H_ 834 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698