| Index: ash/system/tray/tray_background_view.h
|
| diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
|
| index 8b13665566eab7d5b5374b583e3daeb0a33c0986..39f2a4c619db2836ae6b51e207fbe666ccb96d65 100644
|
| --- a/ash/system/tray/tray_background_view.h
|
| +++ b/ash/system/tray/tray_background_view.h
|
| @@ -6,8 +6,8 @@
|
| #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 "ui/views/bubble/tray_bubble_view.h"
|
|
|
| @@ -100,12 +100,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| // 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);
|
|
|
| @@ -155,7 +149,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| // 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_;
|
|
|