Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4781)

Unified Diff: ash/common/system/tray/tray_background_view.h

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/status_area_widget.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_background_view.h
diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h
index 478e427bda77e0b79719747d9decd52ee0a0e6a2..905a083cc86d6abb9895e8576d2b2ef253960cb8 100644
--- a/ash/common/system/tray/tray_background_view.h
+++ b/ash/common/system/tray/tray_background_view.h
@@ -8,9 +8,9 @@
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
#include "ash/common/shelf/shelf_types.h"
#include "ash/common/system/tray/actionable_view.h"
-#include "ash/common/wm/background_animator.h"
#include "base/macros.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/views/bubble/tray_bubble_view.h"
@@ -27,8 +27,8 @@ class WmShelf;
// his shown/hidden. It also inherits from ActionableView so that the tray
// items can override PerformAction when clicked on.
class ASH_EXPORT TrayBackgroundView : public ActionableView,
- public BackgroundAnimatorDelegate,
- public ui::ImplicitAnimationObserver {
+ public ui::ImplicitAnimationObserver,
+ public ShelfBackgroundAnimatorObserver {
public:
static const char kViewClassName[];
@@ -83,9 +83,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
gfx::Rect GetFocusBounds() override;
void OnGestureEvent(ui::GestureEvent* event) override;
- // BackgroundAnimatorDelegate:
- void UpdateBackground(int alpha) override;
-
// Called whenever the shelf alignment changes.
virtual void SetShelfAlignment(ShelfAlignment alignment);
@@ -135,6 +132,9 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
// Updates the arrow visibility based on the launcher visibility.
void UpdateBubbleViewArrow(views::TrayBubbleView* bubble_view);
+ // ShelfBackgroundAnimatorObserver:
+ void UpdateShelfItemBackground(int alpha) override;
+
private:
class TrayWidgetObserver;
« no previous file with comments | « ash/common/system/status_area_widget.cc ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698