| Index: athena/screen/screen_manager_impl.cc
|
| diff --git a/athena/screen/screen_manager_impl.cc b/athena/screen/screen_manager_impl.cc
|
| index 0b9f67e10079de23282d1b28b0af1d83e7f749de..fc88cba47f10766ce117b81a894dd060cb101ea7 100644
|
| --- a/athena/screen/screen_manager_impl.cc
|
| +++ b/athena/screen/screen_manager_impl.cc
|
| @@ -206,7 +206,6 @@ class ScreenManagerImpl : public ScreenManager {
|
| virtual aura::Window* GetContext() OVERRIDE { return root_window_; }
|
| virtual void SetRotation(gfx::Display::Rotation rotation) OVERRIDE;
|
| virtual void SetRotationLocked(bool rotation_locked) OVERRIDE;
|
| - virtual ui::LayerAnimator* GetScreenAnimator() OVERRIDE;
|
|
|
| // Not owned.
|
| aura::Window* root_window_;
|
| @@ -362,10 +361,6 @@ void ScreenManagerImpl::SetRotationLocked(bool rotation_locked) {
|
| SetRotation(last_requested_rotation_);
|
| }
|
|
|
| -ui::LayerAnimator* ScreenManagerImpl::GetScreenAnimator() {
|
| - return root_window_->layer()->GetAnimator();
|
| -}
|
| -
|
| } // namespace
|
|
|
| ScreenManager::ContainerParams::ContainerParams(const std::string& n,
|
|
|