Revert 151752 - Move non SystemTray specific code to TrayBackgroundView

ash/system/tray/system_tray.h

Index: ash/system/tray/system_tray.h
===================================================================
--- ash/system/tray/system_tray.h	(revision 151762)
+++ ash/system/tray/system_tray.h	(working copy)
@@ -41,6 +41,7 @@
 namespace internal {
 class SystemTrayBubble;
 class SystemTrayContainer;
+class SystemTrayLayerAnimationObserver;
 }
 
 // There are different methods for creating bubble views.
@@ -54,6 +55,9 @@
   explicit SystemTray(internal::StatusAreaWidget* status_area_widget);
   virtual ~SystemTray();
 
+  // Called after the tray has been added to the widget containing it.
+  void Initialize();
+
   // Creates the default set of items for the sytem tray.
   void CreateItems();
 
@@ -152,11 +156,10 @@
   bool CloseBubbleForTest() const;
 
   // Overridden from TrayBackgroundView.
-  virtual void Initialize() OVERRIDE;
   virtual void SetShelfAlignment(ShelfAlignment alignment) OVERRIDE;
-  virtual void AnchorUpdated() OVERRIDE;
 
  private:
+  friend class internal::SystemTrayLayerAnimationObserver;
   friend class internal::SystemTrayBubble;
 
   // Resets |bubble_| and clears any related state.
@@ -188,13 +191,18 @@
   // |notification_items_|, or destroys it if there are no notification items.
   void UpdateNotificationBubble();
 
+  // Called when the anchor (tray or bubble) may have moved or changed.
+  void UpdateNotificationAnchor();
+
   // Overridden from internal::ActionableView.
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
+  virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Owned items.
   ScopedVector<SystemTrayItem> items_;
@@ -231,6 +239,9 @@
   // See description agove getter.
   bool should_show_launcher_;
 
+  scoped_ptr<internal::SystemTrayLayerAnimationObserver>
+      layer_animation_observer_;
+
   // Keep track of the default view height so that when we create detailed
   // views directly (e.g. from a notification) we know what height to use.
   int default_bubble_height_;