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

Side by Side Diff: ash/shell.h

Issue 648733003: Implement ScreenOrientationDelegate on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Shift experimental feature to ash Created 6 years, 1 month 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
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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 class OverlayEventFilter; 111 class OverlayEventFilter;
112 class PartialMagnificationController; 112 class PartialMagnificationController;
113 class PowerButtonController; 113 class PowerButtonController;
114 class PowerEventObserver; 114 class PowerEventObserver;
115 class ProjectingObserver; 115 class ProjectingObserver;
116 class ResizeShadowController; 116 class ResizeShadowController;
117 class ResolutionNotificationController; 117 class ResolutionNotificationController;
118 class RootWindowController; 118 class RootWindowController;
119 class ScopedTargetRootWindow; 119 class ScopedTargetRootWindow;
120 class ScreenAsh; 120 class ScreenAsh;
121 class ScreenOrientationDelegate;
121 class ScreenPositionController; 122 class ScreenPositionController;
122 class SessionStateDelegate; 123 class SessionStateDelegate;
123 class Shelf; 124 class Shelf;
124 class ShelfDelegate; 125 class ShelfDelegate;
125 class ShelfItemDelegateManager; 126 class ShelfItemDelegateManager;
126 class ShelfModel; 127 class ShelfModel;
127 class ShelfWindowWatcher; 128 class ShelfWindowWatcher;
128 class ShellDelegate; 129 class ShellDelegate;
129 struct ShellInitParams; 130 struct ShellInitParams;
130 class ShellObserver; 131 class ShellObserver;
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 } 532 }
532 533
533 ResolutionNotificationController* resolution_notification_controller() { 534 ResolutionNotificationController* resolution_notification_controller() {
534 return resolution_notification_controller_.get(); 535 return resolution_notification_controller_.get();
535 } 536 }
536 537
537 LogoutConfirmationController* logout_confirmation_controller() { 538 LogoutConfirmationController* logout_confirmation_controller() {
538 return logout_confirmation_controller_.get(); 539 return logout_confirmation_controller_.get();
539 } 540 }
540 541
542 ScreenOrientationDelegate* screen_orientation_delegate() {
543 return screen_orientation_delegate_.get();
544 }
545
541 VirtualKeyboardController* virtual_keyboard_controller() { 546 VirtualKeyboardController* virtual_keyboard_controller() {
542 return virtual_keyboard_controller_.get(); 547 return virtual_keyboard_controller_.get();
543 } 548 }
544 #endif // defined(OS_CHROMEOS) 549 #endif // defined(OS_CHROMEOS)
545 550
546 ShelfModel* shelf_model() { 551 ShelfModel* shelf_model() {
547 return shelf_model_.get(); 552 return shelf_model_.get();
548 } 553 }
549 554
550 WindowPositioner* window_positioner() { 555 WindowPositioner* window_positioner() {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 731 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
727 // Controls video output device state. 732 // Controls video output device state.
728 scoped_ptr<ui::DisplayConfigurator> display_configurator_; 733 scoped_ptr<ui::DisplayConfigurator> display_configurator_;
729 scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_; 734 scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
730 scoped_ptr<DisplayErrorObserver> display_error_observer_; 735 scoped_ptr<DisplayErrorObserver> display_error_observer_;
731 scoped_ptr<ProjectingObserver> projecting_observer_; 736 scoped_ptr<ProjectingObserver> projecting_observer_;
732 737
733 // Listens for output changes and updates the display manager. 738 // Listens for output changes and updates the display manager.
734 scoped_ptr<DisplayChangeObserver> display_change_observer_; 739 scoped_ptr<DisplayChangeObserver> display_change_observer_;
735 740
741 // Implements content::ScreenOrientationDelegate for ChromeOS
742 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
743
736 scoped_ptr<TouchTransformerController> touch_transformer_controller_; 744 scoped_ptr<TouchTransformerController> touch_transformer_controller_;
737 745
738 #if defined(USE_X11) 746 #if defined(USE_X11)
739 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 747 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
740 scoped_ptr<ui::EventHandler> speech_feedback_handler_; 748 scoped_ptr<ui::EventHandler> speech_feedback_handler_;
741 #endif // defined(USE_X11) 749 #endif // defined(USE_X11)
742 #endif // defined(OS_CHROMEOS) 750 #endif // defined(OS_CHROMEOS)
743 751
744 scoped_ptr<MaximizeModeController> maximize_mode_controller_; 752 scoped_ptr<MaximizeModeController> maximize_mode_controller_;
745 753
(...skipping 18 matching lines...) Expand all
764 772
765 // Injected content::GPUDataManager support. 773 // Injected content::GPUDataManager support.
766 scoped_ptr<GPUSupport> gpu_support_; 774 scoped_ptr<GPUSupport> gpu_support_;
767 775
768 DISALLOW_COPY_AND_ASSIGN(Shell); 776 DISALLOW_COPY_AND_ASSIGN(Shell);
769 }; 777 };
770 778
771 } // namespace ash 779 } // namespace ash
772 780
773 #endif // ASH_SHELL_H_ 781 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698