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

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: 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
« no previous file with comments | « ash/content/display/screen_orientation_delegate_chromeos_unittest.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 <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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 } 529 }
529 530
530 ResolutionNotificationController* resolution_notification_controller() { 531 ResolutionNotificationController* resolution_notification_controller() {
531 return resolution_notification_controller_.get(); 532 return resolution_notification_controller_.get();
532 } 533 }
533 534
534 LogoutConfirmationController* logout_confirmation_controller() { 535 LogoutConfirmationController* logout_confirmation_controller() {
535 return logout_confirmation_controller_.get(); 536 return logout_confirmation_controller_.get();
536 } 537 }
537 538
539 ScreenOrientationDelegate* screen_orientation_delegate() {
540 return screen_orientation_delegate_.get();
541 }
542
538 VirtualKeyboardController* virtual_keyboard_controller() { 543 VirtualKeyboardController* virtual_keyboard_controller() {
539 return virtual_keyboard_controller_.get(); 544 return virtual_keyboard_controller_.get();
540 } 545 }
541 #endif // defined(OS_CHROMEOS) 546 #endif // defined(OS_CHROMEOS)
542 547
543 ShelfModel* shelf_model() { 548 ShelfModel* shelf_model() {
544 return shelf_model_.get(); 549 return shelf_model_.get();
545 } 550 }
546 551
547 WindowPositioner* window_positioner() { 552 WindowPositioner* window_positioner() {
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_; 728 scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
724 // Controls video output device state. 729 // Controls video output device state.
725 scoped_ptr<ui::DisplayConfigurator> display_configurator_; 730 scoped_ptr<ui::DisplayConfigurator> display_configurator_;
726 scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_; 731 scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
727 scoped_ptr<DisplayErrorObserver> display_error_observer_; 732 scoped_ptr<DisplayErrorObserver> display_error_observer_;
728 scoped_ptr<ProjectingObserver> projecting_observer_; 733 scoped_ptr<ProjectingObserver> projecting_observer_;
729 734
730 // Listens for output changes and updates the display manager. 735 // Listens for output changes and updates the display manager.
731 scoped_ptr<DisplayChangeObserver> display_change_observer_; 736 scoped_ptr<DisplayChangeObserver> display_change_observer_;
732 737
738 // Implements content::ScreenOrientationDelegate for ChromeOS
739 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
740
733 scoped_ptr<TouchTransformerController> touch_transformer_controller_; 741 scoped_ptr<TouchTransformerController> touch_transformer_controller_;
734 742
735 #if defined(USE_X11) 743 #if defined(USE_X11)
736 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 744 scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
737 scoped_ptr<ui::EventHandler> speech_feedback_handler_; 745 scoped_ptr<ui::EventHandler> speech_feedback_handler_;
738 #endif // defined(USE_X11) 746 #endif // defined(USE_X11)
739 #endif // defined(OS_CHROMEOS) 747 #endif // defined(OS_CHROMEOS)
740 748
741 scoped_ptr<MaximizeModeController> maximize_mode_controller_; 749 scoped_ptr<MaximizeModeController> maximize_mode_controller_;
742 750
(...skipping 18 matching lines...) Expand all
761 769
762 // Injected content::GPUDataManager support. 770 // Injected content::GPUDataManager support.
763 scoped_ptr<GPUSupport> gpu_support_; 771 scoped_ptr<GPUSupport> gpu_support_;
764 772
765 DISALLOW_COPY_AND_ASSIGN(Shell); 773 DISALLOW_COPY_AND_ASSIGN(Shell);
766 }; 774 };
767 775
768 } // namespace ash 776 } // namespace ash
769 777
770 #endif // ASH_SHELL_H_ 778 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/content/display/screen_orientation_delegate_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698