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

Side by Side Diff: ash/shell.h

Issue 2523873002: Remove DisplayChangeObserver ash dependencies. (Closed)
Patch Set: Change DCO constructor slightly. Created 4 years 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/window_tree_host_manager.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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 class ResolutionNotificationController; 99 class ResolutionNotificationController;
100 class RootWindowController; 100 class RootWindowController;
101 class ScopedOverviewAnimationSettingsFactoryAura; 101 class ScopedOverviewAnimationSettingsFactoryAura;
102 class ScreenOrientationController; 102 class ScreenOrientationController;
103 class ScreenshotController; 103 class ScreenshotController;
104 class ScreenPinningController; 104 class ScreenPinningController;
105 class ScreenPositionController; 105 class ScreenPositionController;
106 class SessionStateDelegate; 106 class SessionStateDelegate;
107 class ShellDelegate; 107 class ShellDelegate;
108 struct ShellInitParams; 108 struct ShellInitParams;
109 class ShutdownObserver;
109 class StickyKeysController; 110 class StickyKeysController;
110 class SystemGestureEventFilter; 111 class SystemGestureEventFilter;
111 class SystemModalContainerEventFilter; 112 class SystemModalContainerEventFilter;
112 class SystemTray; 113 class SystemTray;
113 class ToplevelWindowEventHandler; 114 class ToplevelWindowEventHandler;
114 class TouchTransformerController; 115 class TouchTransformerController;
115 class ScreenLayoutObserver; 116 class ScreenLayoutObserver;
116 class VirtualKeyboardController; 117 class VirtualKeyboardController;
117 class VideoActivityNotifier; 118 class VideoActivityNotifier;
118 class VideoDetector; 119 class VideoDetector;
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 504 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
504 // Controls video output device state. 505 // Controls video output device state.
505 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; 506 std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
506 std::unique_ptr<DisplayColorManager> display_color_manager_; 507 std::unique_ptr<DisplayColorManager> display_color_manager_;
507 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 508 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
508 std::unique_ptr<ProjectingObserver> projecting_observer_; 509 std::unique_ptr<ProjectingObserver> projecting_observer_;
509 510
510 // Listens for output changes and updates the display manager. 511 // Listens for output changes and updates the display manager.
511 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 512 std::unique_ptr<DisplayChangeObserver> display_change_observer_;
512 513
514 // Listens for shutdown and updates DisplayConfigurator.
515 std::unique_ptr<ShutdownObserver> shutdown_observer_;
516
513 // Implements content::ScreenOrientationController for ChromeOS 517 // Implements content::ScreenOrientationController for ChromeOS
514 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 518 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
515 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; 519 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
516 520
517 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 521 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
518 522
519 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 523 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
520 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 524 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
521 std::unique_ptr<LaserPointerController> laser_pointer_controller_; 525 std::unique_ptr<LaserPointerController> laser_pointer_controller_;
522 std::unique_ptr<PartialMagnificationController> 526 std::unique_ptr<PartialMagnificationController>
(...skipping 17 matching lines...) Expand all
540 std::unique_ptr<GPUSupport> gpu_support_; 544 std::unique_ptr<GPUSupport> gpu_support_;
541 545
542 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 546 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
543 547
544 DISALLOW_COPY_AND_ASSIGN(Shell); 548 DISALLOW_COPY_AND_ASSIGN(Shell);
545 }; 549 };
546 550
547 } // namespace ash 551 } // namespace ash
548 552
549 #endif // ASH_SHELL_H_ 553 #endif // ASH_SHELL_H_
OLDNEW
« no previous file with comments | « ash/display/window_tree_host_manager.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698