[ash-md] Remove the number of animators used for the Shelf animations.

ash/common/wm/dock/docked_window_layout_manager.cc

Index: ash/common/wm/dock/docked_window_layout_manager.cc
diff --git a/ash/common/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
index a656bfa63256f1870ffcfab0901a5e1b4435febc..a237884912bf941c171f3355064d104f8b44ebb8 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -56,7 +56,7 @@ class DockedBackgroundWidget : public views::Widget,
         background_animator_(SHELF_BACKGROUND_DEFAULT, nullptr),
         opaque_background_(ui::LAYER_SOLID_COLOR),
         visible_background_type_(manager_->shelf()->GetBackgroundType()),
-        visible_background_change_type_(BACKGROUND_CHANGE_IMMEDIATE) {
+        visible_background_change_type_(gfx::ANIMATION_CHANGE_IMMEDIATE) {
     manager_->shelf()->AddObserver(this);
     InitWidget(manager_->dock_container());
 
@@ -83,15 +83,14 @@ class DockedBackgroundWidget : public views::Widget,
   }
 
   // ShelfBackgroundAnimatorObserver:
-  void UpdateShelfOpaqueBackground(int alpha) override {
+  void UpdateShelfBackground(int alpha) override {
     const float kMaxAlpha = 255.0f;
     opaque_background_.SetOpacity(alpha / kMaxAlpha);
   }
 
   // WmShelfObserver:
-  void OnBackgroundTypeChanged(
-      ShelfBackgroundType background_type,
-      BackgroundAnimatorChangeType change_type) override {
+  void OnBackgroundTypeChanged(ShelfBackgroundType background_type,
+                               gfx::AnimationChangeType change_type) override {
     // Sets the background type. Starts an animation to transition to
     // |background_type| if the widget is visible. If the widget is not visible,
     // the animation is postponed till the widget becomes visible.
@@ -132,9 +131,9 @@ class DockedBackgroundWidget : public views::Widget,
   void UpdateBackground() {
     ShelfBackgroundType background_type =
         IsVisible() ? visible_background_type_ : SHELF_BACKGROUND_DEFAULT;
-    BackgroundAnimatorChangeType change_type =
+    gfx::AnimationChangeType change_type =
         IsVisible() ? visible_background_change_type_
-                    : BACKGROUND_CHANGE_IMMEDIATE;
+                    : gfx::ANIMATION_CHANGE_IMMEDIATE;
     background_animator_.PaintBackground(background_type, change_type);
     SchedulePaintInRect(gfx::Rect(GetWindowBoundsInScreen().size()));
   }
@@ -154,7 +153,7 @@ class DockedBackgroundWidget : public views::Widget,
   ShelfBackgroundType visible_background_type_;
 
   // Whether the widget should animate to |visible_background_type_|.
-  BackgroundAnimatorChangeType visible_background_change_type_;
+  gfx::AnimationChangeType visible_background_change_type_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedBackgroundWidget);
 };