Refactor: Shelf Widget

ash/system/tray/tray_background_view.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_TRAY_BACKGROUND_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_
 
 #include "ash/ash_export.h"
-#include "ash/launcher/background_animator.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/background_animator.h"
+#include "ash/shelf/shelf_types.h"
 #include "ash/system/tray/actionable_view.h"
+#include "ash/system/tray/tray_views.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 
 namespace ash {
 namespace internal {
 
 class ShelfLayoutManager;
 class StatusAreaWidget;
 class TrayEventFilter;
 class TrayBackground;
 
@@ skipping 71 matching lines @@
   // Called by the bubble wrapper when a click event occurs outside the bubble.
   // May close the bubble. Returns true if the event is handled.
   virtual bool ClickedOutsideBubble() = 0;
 
   // Sets |contents| as a child.
   void SetContents(views::View* contents);
 
   // Creates and sets contents background to |background_|.
   void SetContentsBackground();
 
-  // Sets whether the tray paints a background. Default is true, but is set to
-  // false if a window overlaps the shelf.
-  void SetPaintsBackground(
-      bool value,
-      internal::BackgroundAnimator::ChangeType change_type);
-
   // Initializes animations for the bubble.
   void InitializeBubbleAnimations(views::Widget* bubble_widget);
 
   // Returns the window hosting the bubble.
   aura::Window* GetBubbleWindowContainer() const;
 
   // Returns the anchor rect for the bubble.
   gfx::Rect GetBubbleAnchorRect(
       views::Widget* anchor_widget,
       views::TrayBubbleView::AnchorType anchor_type,
@@ skipping 29 matching lines @@
 
   // Convenience pointer to the contents view.
   TrayContainer* tray_container_;
 
   // Shelf alignment.
   ShelfAlignment shelf_alignment_;
 
   // Owned by the view passed to SetContents().
   internal::TrayBackground* background_;
 
-  internal::BackgroundAnimator hide_background_animator_;
   internal::BackgroundAnimator hover_background_animator_;
   scoped_ptr<TrayWidgetObserver> widget_observer_;
   scoped_ptr<TrayEventFilter> tray_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_