| 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 da4eaf547ce28d0d34e9b4df2c69263aab9cf3bb..8b3deae63c0f3ae1b08ef6018851aaafabd414a5 100644
|
| --- a/ash/system/tray/tray_background_view.h
|
| +++ b/ash/system/tray/tray_background_view.h
|
| @@ -77,6 +77,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| // ActionableView:
|
| virtual bool PerformAction(const ui::Event& event) OVERRIDE;
|
| virtual gfx::Rect GetFocusBounds() OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
| // BackgroundAnimatorDelegate:
|
| virtual void UpdateBackground(int alpha) OVERRIDE;
|
| @@ -185,6 +186,10 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| // differently if set to true.
|
| bool draw_background_as_active_;
|
|
|
| + // True if touch view feedback command line flag has been enabled. When
|
| + // enabled touch gestures will toggle rendering the background as active.
|
| + bool touch_feedback_enabled_;
|
| +
|
| scoped_ptr<TrayWidgetObserver> widget_observer_;
|
| scoped_ptr<TrayEventFilter> tray_event_filter_;
|
|
|
|
|