Revert 151752 - Move non SystemTray specific code to TrayBackgroundView

ash/system/tray/tray_background_view.h

Index: ash/system/tray/tray_background_view.h
===================================================================
--- ash/system/tray/tray_background_view.h	(revision 151762)
+++ ash/system/tray/tray_background_view.h	(working copy)
@@ -15,7 +15,6 @@
 
 class StatusAreaWidget;
 class TrayBackground;
-class TrayLayerAnimationObserver;
 
 // Base class for children of StatusAreaWidget: SystemTray, WebNotificationTray.
 // This class handles setting and animating the background when the Launcher
@@ -59,15 +58,10 @@
   explicit TrayBackgroundView(internal::StatusAreaWidget* status_area_widget);
   virtual ~TrayBackgroundView();
 
-  // Called after the tray has been added to the widget containing it.
-  virtual void Initialize();
-
   // Overridden from views::View.
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
-  virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
 
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;
@@ -78,9 +72,6 @@
   // Called whenever the shelf alignment changes.
   virtual void SetShelfAlignment(ShelfAlignment alignment);
 
-  // Called when the anchor (tray or bubble) may have moved or changed.
-  virtual void AnchorUpdated() {}
-
   // Sets |contents| as a child and sets its background to |background_|.
   void SetContents(views::View* contents);
 
@@ -90,6 +81,10 @@
       bool value,
       internal::BackgroundAnimator::ChangeType change_type);
 
+  // Called after all status area trays have been created. Sets the border
+  // based on the position of the view.
+  void SetBorder();
+
   StatusAreaWidget* status_area_widget() {
     return status_area_widget_;
   }
@@ -97,12 +92,6 @@
   ShelfAlignment shelf_alignment() const { return shelf_alignment_; }
 
  private:
-  friend class TrayLayerAnimationObserver;
-
-  // Called from Initialize after all status area trays have been created.
-  // Sets the border based on the position of the view.
-  void SetBorder();
-
   // Unowned pointer to parent widget.
   StatusAreaWidget* status_area_widget_;
 
@@ -117,8 +106,6 @@
 
   internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
-  scoped_ptr<internal::TrayLayerAnimationObserver>
-      layer_animation_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };