| Index: ash/system/date/date_view.h
|
| diff --git a/ash/system/date/date_view.h b/ash/system/date/date_view.h
|
| index 909234174527aa92d9576292793ae593edb042fa..843732e506a36e0d626ee4e34f3ad279072641c7 100644
|
| --- a/ash/system/date/date_view.h
|
| +++ b/ash/system/date/date_view.h
|
| @@ -82,12 +82,14 @@ class DateView : public BaseDateTimeView {
|
| // Tray view used to display the current time.
|
| class TimeView : public BaseDateTimeView {
|
| public:
|
| - TimeView();
|
| + TimeView(TrayDate::ClockLayout clock_layout);
|
| virtual ~TimeView();
|
|
|
| views::Label* label() const { return label_.get(); }
|
| - views::Label* label_hour() const { return label_hour_.get(); }
|
| - views::Label* label_minute() const { return label_minute_.get(); }
|
| + views::Label* label_hour_left() const { return label_hour_left_.get(); }
|
| + views::Label* label_hour_right() const { return label_hour_right_.get(); }
|
| + views::Label* label_minute_left() const { return label_minute_left_.get(); }
|
| + views::Label* label_minute_right() const { return label_minute_right_.get(); }
|
|
|
| // Updates the format of the displayed time.
|
| void UpdateTimeFormat();
|
| @@ -106,10 +108,14 @@ class TimeView : public BaseDateTimeView {
|
| virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
|
|
|
| void SetBorder(TrayDate::ClockLayout clock_layout);
|
| + void SetupLabels();
|
| + void SetupLabel(views::Label* label);
|
|
|
| scoped_ptr<views::Label> label_;
|
| - scoped_ptr<views::Label> label_hour_;
|
| - scoped_ptr<views::Label> label_minute_;
|
| + scoped_ptr<views::Label> label_hour_left_;
|
| + scoped_ptr<views::Label> label_hour_right_;
|
| + scoped_ptr<views::Label> label_minute_left_;
|
| + scoped_ptr<views::Label> label_minute_right_;
|
|
|
| base::HourClockType hour_type_;
|
|
|
|
|