| Index: ash/system/tray/system_tray.h
|
| diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
|
| index 1050b9258e7ad30e7d5445af4e32218fe9f8ea72..494ebd0ace0a66c7da6876190a25b7109a38f619 100644
|
| --- a/ash/system/tray/system_tray.h
|
| +++ b/ash/system/tray/system_tray.h
|
| @@ -41,7 +41,6 @@ class SystemTrayItem;
|
| namespace internal {
|
| class SystemTrayBubble;
|
| class SystemTrayContainer;
|
| -class SystemTrayLayerAnimationObserver;
|
| }
|
|
|
| // There are different methods for creating bubble views.
|
| @@ -55,9 +54,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| 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();
|
|
|
| @@ -156,10 +152,11 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| 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.
|
| @@ -191,18 +188,13 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| // |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_;
|
| @@ -239,9 +231,6 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| // 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_;
|
|
|