diff options
| author | stevenjb <stevenjb@chromium.org> | 2016-01-15 16:30:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-16 00:32:53 +0000 |
| commit | f402ac57b2125147a565f6340b854807ead6aad3 (patch) | |
| tree | e8a9d588efc74461b3ddbac2013447ae658615bd /ash/shell.h | |
| parent | f85424718ca7a8ea3f330141ee68b717ae02f2f0 (diff) | |
| download | chromium_src-f402ac57b2125147a565f6340b854807ead6aad3.zip chromium_src-f402ac57b2125147a565f6340b854807ead6aad3.tar.gz chromium_src-f402ac57b2125147a565f6340b854807ead6aad3.tar.bz2 | |
Rename DisplayConfiguratorAnimation to DisplayAnimator
Also cleans up the class to new style guide some.
BUG=576375
Review URL: https://codereview.chromium.org/1590463004
Cr-Commit-Position: refs/heads/master@{#369893}
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ash/shell.h b/ash/shell.h index 24f6176..8401a6c 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -85,9 +85,9 @@ class AutoclickController; class BluetoothNotificationController; class CaptureController; class DesktopBackgroundController; +class DisplayAnimator; class DisplayChangeObserver; class DisplayColorManager; -class DisplayConfiguratorAnimation; class WindowTreeHostManager; class DisplayErrorObserver; class DisplayManager; @@ -523,9 +523,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, ui::DisplayConfigurator* display_configurator() { return display_configurator_.get(); } - DisplayConfiguratorAnimation* display_configurator_animation() { - return display_configurator_animation_.get(); - } + DisplayAnimator* display_animator() { return display_animator_.get(); } DisplayErrorObserver* display_error_observer() { return display_error_observer_.get(); } @@ -726,7 +724,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, // Controls video output device state. scoped_ptr<ui::DisplayConfigurator> display_configurator_; scoped_ptr<DisplayColorManager> display_color_manager_; - scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_; + scoped_ptr<DisplayAnimator> display_animator_; scoped_ptr<DisplayErrorObserver> display_error_observer_; scoped_ptr<ProjectingObserver> projecting_observer_; |