Move non SystemTray specific code to TrayBackgroundView

ash/system/tray/system_tray.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
 
 #include "ash/ash_export.h"
 #include "ash/system/power/power_supply_status.h"
 #include "ash/system/tray/tray_background_view.h"
@@ skipping 23 matching lines @@
 class SmsObserver;
 class PowerStatusObserver;
 class UpdateObserver;
 class UserObserver;
 
 class SystemTrayItem;
 
 namespace internal {
 class SystemTrayBubble;
 class SystemTrayContainer;
-class SystemTrayLayerAnimationObserver;
 }
 
 // There are different methods for creating bubble views.
 enum BubbleCreationType {
   BUBBLE_CREATE_NEW,    // Closes any existing bubble and creates a new one.
   BUBBLE_USE_EXISTING,  // Uses any existing bubble, or creates a new one.
 };
 
 class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
  public:
   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();
 
   // Adds a new item in the tray.
   void AddTrayItem(SystemTrayItem* item);
 
   // Removes an existing tray item.
   void RemoveTrayItem(SystemTrayItem* item);
 
   // Shows the default view of all items.
@@ skipping 78 matching lines @@
   UserObserver* user_observer() const {
     return user_observer_;
   }
 
   // Accessors for testing.
 
   // Returns true if the bubble exists.
   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.
   void DestroyBubble();
 
   // Called when the widget associated with |bubble| closes. |bubble| should
   // always == |bubble_|. This triggers destroying |bubble_| and hiding the
   // launcher if necessary.
   void RemoveBubble(internal::SystemTrayBubble* bubble);
 
@@ skipping 11 matching lines @@
   void ShowItems(const std::vector<SystemTrayItem*>& items,
                  bool details,
                  bool activate,
                  BubbleCreationType creation_type,
                  int x_offset);
 
   // Constructs or re-constructs |notification_bubble_| and populates it with
   // |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_;
 
   // Pointers to members of |items_|.
   SystemTrayItem* detailed_item_;
   std::vector<SystemTrayItem*> notification_items_;
 
   // Mappings of system tray item and it's view in the tray.
   std::map<SystemTrayItem*, views::View*> tray_item_map_;
@@ skipping 16 matching lines @@
 
   // Bubble for default and detailed views.
   scoped_ptr<internal::SystemTrayBubble> bubble_;
 
   // Bubble for notifications.
   scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
 
   // 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_;
 
   // Set to true when system notifications should be hidden (e.g. web
   // notification bubble is visible).
   bool hide_notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTray);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_