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

Side by Side Diff: ash/shell.h

Issue 2523873002: Remove DisplayChangeObserver ash dependencies. (Closed)
Patch Set: Remove comment. 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
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 class RootWindowController; 104 class RootWindowController;
105 class ScopedOverviewAnimationSettingsFactoryAura; 105 class ScopedOverviewAnimationSettingsFactoryAura;
106 class ScreenAsh; 106 class ScreenAsh;
107 class ScreenOrientationController; 107 class ScreenOrientationController;
108 class ScreenshotController; 108 class ScreenshotController;
109 class ScreenPinningController; 109 class ScreenPinningController;
110 class ScreenPositionController; 110 class ScreenPositionController;
111 class SessionStateDelegate; 111 class SessionStateDelegate;
112 class ShellDelegate; 112 class ShellDelegate;
113 struct ShellInitParams; 113 struct ShellInitParams;
114 class ShutdownObserver;
114 class SlowAnimationEventFilter; 115 class SlowAnimationEventFilter;
115 class StatusAreaWidget; 116 class StatusAreaWidget;
116 class StickyKeysController; 117 class StickyKeysController;
117 class SystemGestureEventFilter; 118 class SystemGestureEventFilter;
118 class SystemModalContainerEventFilter; 119 class SystemModalContainerEventFilter;
119 class SystemTray; 120 class SystemTray;
120 class ToplevelWindowEventHandler; 121 class ToplevelWindowEventHandler;
121 class TouchTransformerController; 122 class TouchTransformerController;
122 class TouchObserverHUD; 123 class TouchObserverHUD;
123 class ScreenLayoutObserver; 124 class ScreenLayoutObserver;
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_; 512 std::unique_ptr<chromeos::AudioA11yController> audio_a11y_controller_;
512 // Controls video output device state. 513 // Controls video output device state.
513 std::unique_ptr<ui::DisplayConfigurator> display_configurator_; 514 std::unique_ptr<ui::DisplayConfigurator> display_configurator_;
514 std::unique_ptr<DisplayColorManager> display_color_manager_; 515 std::unique_ptr<DisplayColorManager> display_color_manager_;
515 std::unique_ptr<DisplayErrorObserver> display_error_observer_; 516 std::unique_ptr<DisplayErrorObserver> display_error_observer_;
516 std::unique_ptr<ProjectingObserver> projecting_observer_; 517 std::unique_ptr<ProjectingObserver> projecting_observer_;
517 518
518 // Listens for output changes and updates the display manager. 519 // Listens for output changes and updates the display manager.
519 std::unique_ptr<DisplayChangeObserver> display_change_observer_; 520 std::unique_ptr<DisplayChangeObserver> display_change_observer_;
520 521
522 // Listens for shutdown and updates DisplayConfigurator.
523 std::unique_ptr<ShutdownObserver> shutdown_observer_;
524
521 // Implements content::ScreenOrientationController for ChromeOS 525 // Implements content::ScreenOrientationController for ChromeOS
522 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_; 526 std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
523 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_; 527 std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
524 528
525 std::unique_ptr<TouchTransformerController> touch_transformer_controller_; 529 std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
526 530
527 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_; 531 std::unique_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
528 std::unique_ptr<ui::EventHandler> speech_feedback_handler_; 532 std::unique_ptr<ui::EventHandler> speech_feedback_handler_;
529 std::unique_ptr<LaserPointerController> laser_pointer_controller_; 533 std::unique_ptr<LaserPointerController> laser_pointer_controller_;
530 std::unique_ptr<PartialMagnificationController> 534 std::unique_ptr<PartialMagnificationController>
(...skipping 17 matching lines...) Expand all
548 std::unique_ptr<GPUSupport> gpu_support_; 552 std::unique_ptr<GPUSupport> gpu_support_;
549 553
550 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_; 554 std::unique_ptr<ImmersiveHandlerFactoryAsh> immersive_handler_factory_;
551 555
552 DISALLOW_COPY_AND_ASSIGN(Shell); 556 DISALLOW_COPY_AND_ASSIGN(Shell);
553 }; 557 };
554 558
555 } // namespace ash 559 } // namespace ash
556 560
557 #endif // ASH_SHELL_H_ 561 #endif // ASH_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698