summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 6f88e1d..718a6c6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -83,6 +83,7 @@ class BluetoothNotificationController;
class CaptureController;
class DesktopBackgroundController;
class DisplayChangeObserver;
+class DisplayConfiguratorAnimation;
class DisplayController;
class DisplayErrorObserver;
class DisplayManager;
@@ -107,7 +108,6 @@ class MouseCursorEventFilter;
class MruWindowTracker;
class NestedDispatcherController;
class NewWindowDelegate;
-class OutputConfiguratorAnimation;
class OverlayEventFilter;
class PartialMagnificationController;
class PowerButtonController;
@@ -504,8 +504,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
ui::DisplayConfigurator* display_configurator() {
return display_configurator_.get();
}
- OutputConfiguratorAnimation* output_configurator_animation() {
- return output_configurator_animation_.get();
+ DisplayConfiguratorAnimation* display_configurator_animation() {
+ return display_configurator_animation_.get();
}
DisplayErrorObserver* display_error_observer() {
return display_error_observer_.get();
@@ -704,7 +704,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
last_window_closed_logout_reminder_;
// Controls video output device state.
scoped_ptr<ui::DisplayConfigurator> display_configurator_;
- scoped_ptr<OutputConfiguratorAnimation> output_configurator_animation_;
+ scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
scoped_ptr<DisplayErrorObserver> display_error_observer_;
scoped_ptr<ProjectingObserver> projecting_observer_;