diff options
author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 23:17:04 +0000 |
---|---|---|
committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-24 23:17:04 +0000 |
commit | 129aad8497f52e19450572120d514dec4a8c66d6 (patch) | |
tree | 9c65fa9b793cd90618d61c45b39d4d66b1a5f3c8 /ash/shell.h | |
parent | 1eb088e6b30f7e8dd2d0eabcef6993a0c7bc7ef0 (diff) | |
download | chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.zip chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.tar.gz chromium_src-129aad8497f52e19450572120d514dec4a8c66d6.tar.bz2 |
Update naming from OutputConfiguratorAnimation to DisplayConfiguratorAnimation
BUG=333413
Review URL: https://codereview.chromium.org/250163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r-- | ash/shell.h | 8 |
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_; |