| Index: ash/shelf/shelf_widget.h
|
| diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h
|
| index af6de3defeb81d3fd61485a5edb71f769c09d5db..9b125ac77225146aa2db81a9855f58a78278ec0f 100644
|
| --- a/ash/shelf/shelf_widget.h
|
| +++ b/ash/shelf/shelf_widget.h
|
| @@ -80,27 +80,18 @@ class ASH_EXPORT ShelfWidget : public views::Widget,
|
| // Force the shelf to be presented in an undimmed state.
|
| void ForceUndimming(bool force);
|
|
|
| - // Overridden from views::WidgetObserver:
|
| + // views::WidgetObserver:
|
| void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
|
|
|
| - // A function to test the current alpha used by the dimming bar. If there is
|
| - // no dimmer active, the function will return -1.
|
| - int GetDimmingAlphaForTest();
|
| -
|
| - // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
|
| - // the dimmer is inactive.
|
| - gfx::Rect GetDimmerBoundsForTest();
|
| -
|
| - // Disable dimming animations for running tests.
|
| - void DisableDimmingAnimationsForTest();
|
| -
|
| - // ShelfLayoutManagerObserver overrides:
|
| + // ShelfLayoutManagerObserver:
|
| void WillDeleteShelfLayoutManager() override;
|
|
|
| private:
|
| class DelegateView;
|
|
|
| // views::Widget:
|
| + void OnDragEnter() override;
|
| + void OnDragExit() override;
|
| void OnMouseEvent(ui::MouseEvent* event) override;
|
| void OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
|
|