| Index: ash/system/date/date_view.h
|
| diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
|
| index 1f4377abaf5d1ba5828df45d29f458784e230922..20a831d5b5c79cc5d19ef62dc66dddc56ff9cd9a 100644
|
| --- a/ash/system/date/date_view.h
|
| +++ b/ash/system/date/date_view.h
|
| @@ -65,7 +65,14 @@ class ASH_EXPORT DateView : public BaseDateTimeView {
|
|
|
| base::HourClockType GetHourTypeForTesting() const;
|
|
|
| + bool active() const {
|
| + return active_;
|
| + }
|
| +
|
| private:
|
| + // Sets |active_| and updates the color of |date_label_|.
|
| + void SetActive(bool active);
|
| +
|
| // Overridden from BaseDateTimeView.
|
| virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
|
|
|
| @@ -75,6 +82,14 @@ class ASH_EXPORT DateView : public BaseDateTimeView {
|
| // Overridden from views::View.
|
| virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
|
| virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
|
| + virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
| +
|
| + // True when a mouse is within the bounds, or when a tap gesture is occuring.
|
| + bool 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_;
|
|
|
| views::Label* date_label_;
|
|
|
|
|