diff options
Diffstat (limited to 'ash/system')
-rw-r--r-- | ash/system/tray/system_tray_bubble.cc | 4 | ||||
-rw-r--r-- | ash/system/tray/tray_item_view.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc index aff2719..0059973 100644 --- a/ash/system/tray/system_tray_bubble.cc +++ b/ash/system/tray/system_tray_bubble.cc @@ -165,7 +165,7 @@ void SystemTrayBubble::UpdateView( settings.SetTransitionDuration(swipe_duration); settings.SetTweenType(ui::Tween::EASE_OUT); gfx::Transform transform; - transform.SetTranslateX(layer->bounds().width()); + transform.Translate(layer->bounds().width(), 0.0); layer->SetTransform(transform); } @@ -218,7 +218,7 @@ void SystemTrayBubble::UpdateView( ui::Layer* new_layer = bubble_view_->layer(); gfx::Rect bounds = new_layer->bounds(); gfx::Transform transform; - transform.SetTranslateX(bounds.width()); + transform.Translate(bounds.width(), 0.0); new_layer->SetTransform(transform); { ui::ScopedLayerAnimationSettings settings(new_layer->GetAnimator()); diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc index 87644d08..b93163c 100644 --- a/ash/system/tray/tray_item_view.cc +++ b/ash/system/tray/tray_item_view.cc @@ -95,10 +95,10 @@ void TrayItemView::ChildPreferredSizeChanged(views::View* child) { void TrayItemView::AnimationProgressed(const ui::Animation* animation) { gfx::Transform transform; - transform.SetScale(animation->GetCurrentValue(), - animation->GetCurrentValue()); - transform.ConcatTranslate(0, animation->CurrentValueBetween( + transform.Translate(0, animation->CurrentValueBetween( static_cast<double>(height()) / 2, 0.)); + transform.Scale(animation->GetCurrentValue(), + animation->GetCurrentValue()); layer()->SetTransform(transform); PreferredSizeChanged(); } |