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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 // ui::CompositorObserver overrides: | 286 // ui::CompositorObserver overrides: |
287 void OnCompositingDidCommit(ui::Compositor* compositor) override {} | 287 void OnCompositingDidCommit(ui::Compositor* compositor) override {} |
288 void OnCompositingStarted(ui::Compositor* compositor, | 288 void OnCompositingStarted(ui::Compositor* compositor, |
289 base::TimeTicks start_time) override {} | 289 base::TimeTicks start_time) override {} |
290 void OnCompositingEnded(ui::Compositor* compositor) override {} | 290 void OnCompositingEnded(ui::Compositor* compositor) override {} |
291 void OnCompositingAborted(ui::Compositor* compositor) override { | 291 void OnCompositingAborted(ui::Compositor* compositor) override { |
292 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. | 292 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
293 layer_owner_->root()->GetAnimator()->StopAnimating(); | 293 layer_owner_->root()->GetAnimator()->StopAnimating(); |
294 } | 294 } |
295 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {} | 295 void OnCompositingLockStateChanged(ui::Compositor* compositor) override {} |
| 296 void OnCompositingShuttingDown(ui::Compositor* compositor) override {} |
296 | 297 |
297 // aura::WindowObserver overrides: | 298 // aura::WindowObserver overrides: |
298 void OnWindowDestroying(aura::Window* window) override { | 299 void OnWindowDestroying(aura::Window* window) override { |
299 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. | 300 // Triggers OnImplicitAnimationsCompleted() to be called and deletes us. |
300 layer_owner_->root()->GetAnimator()->StopAnimating(); | 301 layer_owner_->root()->GetAnimator()->StopAnimating(); |
301 } | 302 } |
302 void OnWindowRemovingFromRootWindow(aura::Window* window, | 303 void OnWindowRemovingFromRootWindow(aura::Window* window, |
303 aura::Window* new_root) override { | 304 aura::Window* new_root) override { |
304 layer_owner_->root()->GetAnimator()->StopAnimating(); | 305 layer_owner_->root()->GetAnimator()->StopAnimating(); |
305 } | 306 } |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
503 case SHELF_ALIGNMENT_LEFT: | 504 case SHELF_ALIGNMENT_LEFT: |
504 return gfx::Rect(work_area.x(), work_area.y(), 0, 0); | 505 return gfx::Rect(work_area.x(), work_area.y(), 0, 0); |
505 case SHELF_ALIGNMENT_RIGHT: | 506 case SHELF_ALIGNMENT_RIGHT: |
506 return gfx::Rect(work_area.right(), work_area.y(), 0, 0); | 507 return gfx::Rect(work_area.right(), work_area.y(), 0, 0); |
507 } | 508 } |
508 NOTREACHED(); | 509 NOTREACHED(); |
509 return gfx::Rect(); | 510 return gfx::Rect(); |
510 } | 511 } |
511 | 512 |
512 } // namespace ash | 513 } // namespace ash |
OLD | NEW |