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

Unified Diff: athena/screen/screen_manager_impl.cc

Issue 585623003: [Athena] Make a quick power button tap suspend the device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/screen/public/screen_manager.h ('k') | athena/system/power_button_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « athena/screen/public/screen_manager.h ('k') | athena/system/power_button_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698