| 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/shelf/shelf_layout_manager.h" | 5 #include "ash/shelf/shelf_layout_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <cstring> | 9 #include <cstring> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 656 ui::ImplicitAnimationObserver* observer) { | 656 ui::ImplicitAnimationObserver* observer) { |
| 657 base::AutoReset<bool> auto_reset_updating_bounds(&updating_bounds_, true); | 657 base::AutoReset<bool> auto_reset_updating_bounds(&updating_bounds_, true); |
| 658 | 658 |
| 659 ui::ScopedLayerAnimationSettings launcher_animation_setter( | 659 ui::ScopedLayerAnimationSettings launcher_animation_setter( |
| 660 GetLayer(shelf_)->GetAnimator()); | 660 GetLayer(shelf_)->GetAnimator()); |
| 661 ui::ScopedLayerAnimationSettings status_animation_setter( | 661 ui::ScopedLayerAnimationSettings status_animation_setter( |
| 662 GetLayer(shelf_->status_area_widget())->GetAnimator()); | 662 GetLayer(shelf_->status_area_widget())->GetAnimator()); |
| 663 if (animate) { | 663 if (animate) { |
| 664 launcher_animation_setter.SetTransitionDuration( | 664 launcher_animation_setter.SetTransitionDuration( |
| 665 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 665 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
| 666 launcher_animation_setter.SetTweenType(ui::Tween::EASE_OUT); | 666 launcher_animation_setter.SetTweenType(gfx::Tween::EASE_OUT); |
| 667 launcher_animation_setter.SetPreemptionStrategy( | 667 launcher_animation_setter.SetPreemptionStrategy( |
| 668 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); | 668 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
| 669 status_animation_setter.SetTransitionDuration( | 669 status_animation_setter.SetTransitionDuration( |
| 670 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 670 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
| 671 status_animation_setter.SetTweenType(ui::Tween::EASE_OUT); | 671 status_animation_setter.SetTweenType(gfx::Tween::EASE_OUT); |
| 672 status_animation_setter.SetPreemptionStrategy( | 672 status_animation_setter.SetPreemptionStrategy( |
| 673 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); | 673 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
| 674 } else { | 674 } else { |
| 675 StopAnimating(); | 675 StopAnimating(); |
| 676 launcher_animation_setter.SetTransitionDuration(base::TimeDelta()); | 676 launcher_animation_setter.SetTransitionDuration(base::TimeDelta()); |
| 677 status_animation_setter.SetTransitionDuration(base::TimeDelta()); | 677 status_animation_setter.SetTransitionDuration(base::TimeDelta()); |
| 678 } | 678 } |
| 679 if (observer) | 679 if (observer) |
| 680 status_animation_setter.AddObserver(observer); | 680 status_animation_setter.AddObserver(observer); |
| 681 | 681 |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1149 return gfx::Insets(0, distance, 0, 0); | 1149 return gfx::Insets(0, distance, 0, 0); |
| 1150 case SHELF_ALIGNMENT_TOP: | 1150 case SHELF_ALIGNMENT_TOP: |
| 1151 return gfx::Insets(0, 0, distance, 0); | 1151 return gfx::Insets(0, 0, distance, 0); |
| 1152 } | 1152 } |
| 1153 NOTREACHED(); | 1153 NOTREACHED(); |
| 1154 return gfx::Insets(); | 1154 return gfx::Insets(); |
| 1155 } | 1155 } |
| 1156 | 1156 |
| 1157 } // namespace internal | 1157 } // namespace internal |
| 1158 } // namespace ash | 1158 } // namespace ash |
| OLD | NEW |