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

Unified Diff: ash/system/date/date_view.h

Issue 560473003: DateView Touch Feedback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | ash/system/date/date_view.cc » ('j') | ash/system/date/date_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « no previous file | ash/system/date/date_view.cc » ('j') | ash/system/date/date_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698