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

Side by Side Diff: ash/system/date/date_view.h

Issue 10832282: Replace views::MouseEvent with ui::MouseEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/date/date_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_ 5 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_
6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_ 6 #define ASH_SYSTEM_DATE_DATE_VIEW_H_
7 7
8 #include "ash/system/date/tray_date.h" 8 #include "ash/system/date/tray_date.h"
9 #include "ash/system/tray/tray_views.h" 9 #include "ash/system/tray/tray_views.h"
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 void SetActionable(bool actionable); 60 void SetActionable(bool actionable);
61 61
62 private: 62 private:
63 // Overridden from BaseDateTimeView. 63 // Overridden from BaseDateTimeView.
64 virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; 64 virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
65 65
66 // Overridden from ActionableView. 66 // Overridden from ActionableView.
67 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 67 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
68 68
69 // Overridden from views::View. 69 // Overridden from views::View.
70 virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE; 70 virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
71 virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE; 71 virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
72 72
73 views::Label* date_label_; 73 views::Label* date_label_;
74 views::Label* day_of_week_label_; 74 views::Label* day_of_week_label_;
75 75
76 bool actionable_; 76 bool actionable_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(DateView); 78 DISALLOW_COPY_AND_ASSIGN(DateView);
79 }; 79 };
80 80
81 // Tray view used to display the current time. 81 // Tray view used to display the current time.
(...skipping 15 matching lines...) Expand all
97 void UpdateClockLayout(TrayDate::ClockLayout clock_layout); 97 void UpdateClockLayout(TrayDate::ClockLayout clock_layout);
98 98
99 private: 99 private:
100 // Overridden from BaseDateTimeView. 100 // Overridden from BaseDateTimeView.
101 virtual void UpdateTextInternal(const base::Time& now) OVERRIDE; 101 virtual void UpdateTextInternal(const base::Time& now) OVERRIDE;
102 102
103 // Overridden from ActionableView. 103 // Overridden from ActionableView.
104 virtual bool PerformAction(const ui::Event& event) OVERRIDE; 104 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
105 105
106 // Overridden from views::View. 106 // Overridden from views::View.
107 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 107 virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
108 108
109 void SetBorder(TrayDate::ClockLayout clock_layout); 109 void SetBorder(TrayDate::ClockLayout clock_layout);
110 void SetupLabels(); 110 void SetupLabels();
111 void SetupLabel(views::Label* label); 111 void SetupLabel(views::Label* label);
112 112
113 scoped_ptr<views::Label> label_; 113 scoped_ptr<views::Label> label_;
114 scoped_ptr<views::Label> label_hour_left_; 114 scoped_ptr<views::Label> label_hour_left_;
115 scoped_ptr<views::Label> label_hour_right_; 115 scoped_ptr<views::Label> label_hour_right_;
116 scoped_ptr<views::Label> label_minute_left_; 116 scoped_ptr<views::Label> label_minute_left_;
117 scoped_ptr<views::Label> label_minute_right_; 117 scoped_ptr<views::Label> label_minute_right_;
118 118
119 base::HourClockType hour_type_; 119 base::HourClockType hour_type_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(TimeView); 121 DISALLOW_COPY_AND_ASSIGN(TimeView);
122 }; 122 };
123 123
124 } // namespace tray 124 } // namespace tray
125 } // namespace internal 125 } // namespace internal
126 } // namespace ash 126 } // namespace ash
127 127
128 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_ 128 #endif // ASH_SYSTEM_DATE_DATE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shell/window_type_launcher.cc ('k') | ash/system/date/date_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698