Revise accessibility for Date/TimeView.

ash/system/date/date_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SYSTEM_DATE_DATE_VIEW_H_
 #define ASH_SYSTEM_DATE_DATE_VIEW_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 13 matching lines @@
 
 // Abstract base class containing common updating and layout code for the
 // DateView popup and the TimeView tray icon. Exported for tests.
 class ASH_EXPORT BaseDateTimeView : public ActionableView {
  public:
   ~BaseDateTimeView() override;
 
   // Updates the displayed text for the current time and calls SetTimer().
   void UpdateText();
 
+  // views::View overrides:
+  void GetAccessibleState(ui::AXViewState* state) override;
+
  protected:
   BaseDateTimeView();
 
+  // Updates labels to display the current time.
+  virtual void UpdateTextInternal(const base::Time& now);
+
+  // Time format (12/24hr) used for accessibility string.
+  base::HourClockType hour_type_;
+
  private:
   // Starts |timer_| to schedule the next update.
   void SetTimer(const base::Time& now);
 
-  // Updates labels to display the current time.
-  virtual void UpdateTextInternal(const base::Time& now) = 0;
-
   // Overridden from views::View.
   void ChildPreferredSizeChanged(views::View* child) override;
   void OnLocaleChanged() override;
 
   // Invokes UpdateText() when the displayed time should change.
   base::OneShotTimer timer_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseDateTimeView);
 };
 
@@ skipping 23 matching lines @@
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override;
 
   // Overridden from views::View.
   void OnMouseEntered(const ui::MouseEvent& event) override;
   void OnMouseExited(const ui::MouseEvent& event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   views::Label* date_label_;
 
-  // Time format (12/24hr) used for accessibility string.
-  base::HourClockType hour_type_;
-
   TrayDate::DateAction action_;
 
   DISALLOW_COPY_AND_ASSIGN(DateView);
 };
 
 // Tray view used to display the current time.
 // Exported for tests.
 class ASH_EXPORT TimeView : public BaseDateTimeView {
  public:
   explicit TimeView(TrayDate::ClockLayout clock_layout);
@@ skipping 23 matching lines @@
   void SetupLabels();
   void SetupLabel(views::Label* label);
 
   // Label text used for the normal horizontal shelf.
   std::unique_ptr<views::Label> horizontal_label_;
 
   // The time label is split into two lines for the vertical shelf.
   std::unique_ptr<views::Label> vertical_label_hours_;
   std::unique_ptr<views::Label> vertical_label_minutes_;
 
-  base::HourClockType hour_type_;
-
   DISALLOW_COPY_AND_ASSIGN(TimeView);
 };
 
 }  // namespace tray
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_DATE_DATE_VIEW_H_