OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/wm/window_animations.h" | 5 #include "ash/wm/window_animations.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <vector> | 10 #include <vector> |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
279 } | 279 } |
280 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { | 280 virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE { |
281 } | 281 } |
282 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { | 282 virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE { |
283 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. | 283 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
284 layer_->GetAnimator()->StopAnimating(); | 284 layer_->GetAnimator()->StopAnimating(); |
285 } | 285 } |
286 virtual void OnCompositingLockStateChanged( | 286 virtual void OnCompositingLockStateChanged( |
287 ui::Compositor* compositor) OVERRIDE { | 287 ui::Compositor* compositor) OVERRIDE { |
288 } | 288 } |
289 virtual void OnUpdateVSyncParameters(ui::Compositor* compositor, | |
290 base::TimeTicks timebase, | |
291 base::TimeDelta interval) OVERRIDE { | |
292 } | |
293 | 289 |
294 // aura::WindowObserver overrides: | 290 // aura::WindowObserver overrides: |
295 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { | 291 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE { |
296 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. | 292 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
297 layer_->GetAnimator()->StopAnimating(); | 293 layer_->GetAnimator()->StopAnimating(); |
298 } | 294 } |
299 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE { | 295 virtual void OnWindowRemovingFromRootWindow(aura::Window* window) OVERRIDE { |
300 layer_->GetAnimator()->StopAnimating(); | 296 layer_->GetAnimator()->StopAnimating(); |
301 } | 297 } |
302 | 298 |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
541 } | 537 } |
542 | 538 |
543 // Assume the shelf is overflowed, zoom off to the bottom right of the | 539 // Assume the shelf is overflowed, zoom off to the bottom right of the |
544 // work area. | 540 // work area. |
545 gfx::Rect work_area = | 541 gfx::Rect work_area = |
546 Shell::GetScreen()->GetDisplayNearestWindow(window).work_area(); | 542 Shell::GetScreen()->GetDisplayNearestWindow(window).work_area(); |
547 return gfx::Rect(work_area.right(), work_area.bottom(), 0, 0); | 543 return gfx::Rect(work_area.right(), work_area.bottom(), 0, 0); |
548 } | 544 } |
549 | 545 |
550 } // namespace ash | 546 } // namespace ash |
OLD | NEW |