ui/base/animation -> ui/gfx/animation

ash/system/tray/system_tray_bubble.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/tray/system_tray_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 153 matching lines @@
     DCHECK(layer);
     layer->SuppressPaint();
 
     // When transitioning from detailed view to default view, animate the
     // existing view (slide out towards the right).
     if (bubble_type == BUBBLE_TYPE_DEFAULT) {
       ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
       settings.AddObserver(
           new AnimationObserverDeleteLayer(scoped_layer.release()));
       settings.SetTransitionDuration(swipe_duration);
-      settings.SetTweenType(ui::Tween::EASE_OUT);
+      settings.SetTweenType(gfx::Tween::EASE_OUT);
       gfx::Transform transform;
       transform.Translate(layer->bounds().width(), 0.0);
       layer->SetTransform(transform);
     }
 
     {
       // Add a shadow layer to make the old layer darker as the animation
       // progresses.
       ui::Layer* shadow = new ui::Layer(ui::LAYER_SOLID_COLOR);
       shadow->SetColor(SK_ColorBLACK);
       shadow->SetOpacity(0.01f);
       shadow->SetBounds(layer->bounds());
       layer->Add(shadow);
       layer->StackAtTop(shadow);
       {
         // Animate the darkening effect a little longer than the swipe-in. This
         // is to make sure the darkening animation does not end up finishing
         // early, because the dark layer goes away at the end of the animation,
         // and there is a brief moment when the old view is still visible, but
         // it does not have the shadow layer on top.
         ui::ScopedLayerAnimationSettings settings(shadow->GetAnimator());
         settings.AddObserver(new AnimationObserverDeleteLayer(shadow));
         settings.SetTransitionDuration(swipe_duration +
                                        base::TimeDelta::FromMilliseconds(150));
-        settings.SetTweenType(ui::Tween::LINEAR);
+        settings.SetTweenType(gfx::Tween::LINEAR);
         shadow->SetOpacity(0.15f);
       }
     }
   }
 
   DestroyItemViews();
   bubble_view_->RemoveAllChildViews(true);
 
   items_ = items;
   bubble_type_ = bubble_type;
@@ skipping 25 matching lines @@
       gfx::Rect bounds = new_layer->bounds();
       gfx::Transform transform;
       transform.Translate(bounds.width(), 0.0);
       new_layer->SetTransform(transform);
       {
         ui::ScopedLayerAnimationSettings settings(new_layer->GetAnimator());
         settings.AddObserver(
             new AnimationObserverDeleteLayer(scoped_layer.release()));
         settings.SetTransitionDuration(
             base::TimeDelta::FromMilliseconds(kSwipeDelayMS));
-        settings.SetTweenType(ui::Tween::EASE_OUT);
+        settings.SetTweenType(gfx::Tween::EASE_OUT);
         new_layer->SetTransform(gfx::Transform());
       }
     }
   }
 }
 
 void SystemTrayBubble::InitView(views::View* anchor,
                                 user::LoginStatus login_status,
                                 TrayBubbleView::InitParams* init_params) {
   DCHECK(bubble_view_ == NULL);
@@ skipping 108 matching lines @@
     // For default view, draw bottom border for each item, except the last
     // 2 items, which are the bottom header row and the one just above it.
     bubble_view_->AddChildView(new TrayPopupItemContainer(
         item_views[i], is_default_bubble,
         is_default_bubble && (i < item_views.size() - 2)));
   }
 }
 
 }  // namespace internal
 }  // namespace ash