Revert of Replaced BackgroundAnimator with ShelfBackgroundAnimator.

ash/shelf/shelf_layout_manager.h

 // Copyright 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.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 165 matching lines @@
   }
 
   template <typename T>
   T PrimaryAxisValue(T horizontal, T vertical) const {
     return IsHorizontalAlignment() ? horizontal : vertical;
   }
 
   // Is the shelf's alignment horizontal?
   bool IsHorizontalAlignment() const;
 
-  // Returns how the shelf background is painted.
-  ShelfBackgroundType GetShelfBackgroundType() const;
-
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
 
  private:
   class AutoHideEventFilter;
   class RootWindowControllerObserverImpl;
   class UpdateShelfObserver;
   friend class PanelLayoutManagerTest;
   friend class ShelfLayoutManagerTest;
@@ skipping 54 matching lines @@
   // Calculates the target bounds assuming visibility of |visible|.
   void CalculateTargetBounds(const State& state, TargetBounds* target_bounds);
 
   // Updates the target bounds if a gesture-drag is in progress. This is only
   // used by |CalculateTargetBounds()|.
   void UpdateTargetBoundsForGesture(TargetBounds* target_bounds) const;
 
   // Updates the background of the shelf.
   void UpdateShelfBackground(BackgroundAnimatorChangeType type);
 
+  // Returns how the shelf background is painted.
+  ShelfBackgroundType GetShelfBackgroundType() const;
+
   // Updates the auto hide state immediately.
   void UpdateAutoHideStateNow();
 
   // Stops the auto hide timer and clears
   // |mouse_over_shelf_when_auto_hide_timer_started_|.
   void StopAutoHideTimer();
 
   // Returns the bounds of an additional region which can trigger showing the
   // shelf. This region exists to make it easier to trigger showing the shelf
   // when the shelf is auto hidden and the shelf is on the boundary between
@@ skipping 100 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_