Add an accessible name to the restart button

ash/system/tray/tray_views.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_TRAY_TRAY_VIEWS_H_
 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
 #pragma once
 
 #include "ui/gfx/font.h"
 #include "ui/gfx/size.h"
@@ skipping 31 matching lines @@
 };
 
 // A focusable view that performs an action when user clicks on it, or presses
 // enter or space when focused.
 class ActionableView : public views::View {
  public:
   ActionableView();
 
   virtual ~ActionableView();
 
+  // Set the accessible name.
+  void SetAccessibleName(const string16& name);
+  const string16& accessible_name() const { return accessible_name_; }
+
  protected:
   // Performs an action when user clicks on the view (on mouse-press event), or
   // presses a key when this view is in focus. Returns true if the event has
   // been handled and an action was performed. Returns false otherwise.
   virtual bool PerformAction(const views::Event& event) = 0;
 
   // Overridden from views::View.
   virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
  private:
+  string16 accessible_name_;
+
   DISALLOW_COPY_AND_ASSIGN(ActionableView);
 };
 
 class ViewClickListener {
  public:
   virtual ~ViewClickListener() {}
   virtual void ClickedOn(views::View* sender) = 0;
 };
 
 // A view that changes background color on hover, and triggers a callback in the
 // associated ViewClickListener on click. The view can also be forced to
 // maintain a fixed height.
 class HoverHighlightView : public ActionableView {
  public:
   explicit HoverHighlightView(ViewClickListener* listener);
   virtual ~HoverHighlightView();
 
-  // Convenience function for adding an icon and a label.
+  // Convenience function for adding an icon and a label.  This also sets the
+  // accessible name.
   void AddIconAndLabel(const SkBitmap& image,
                        const string16& text,
                        gfx::Font::FontStyle style);
 
   // Convenience function for adding a label with padding on the left for a
-  // blank icon.
+  // blank icon.  This also sets the accessible name.
   void AddLabel(const string16& text, gfx::Font::FontStyle style);
 
-  // Set the accessible name.  Should be used if this doesn't match the label.
-  void SetAccessibleName(const string16& name);
-
   void set_highlight_color(SkColor color) { highlight_color_ = color; }
   void set_default_color(SkColor color) { default_color_ = color; }
   void set_fixed_height(int height) { fixed_height_ = height; }
 
  private:
   // Overridden from ActionableView.
   virtual bool PerformAction(const views::Event& event) OVERRIDE;
 
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual void OnEnabledChanged() OVERRIDE;
   virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
 
   ViewClickListener* listener_;
-  string16 accessible_name_;
   SkColor highlight_color_;
   SkColor default_color_;
   int fixed_height_;
   bool hover_;
 
   DISALLOW_COPY_AND_ASSIGN(HoverHighlightView);
 };
 
 // A custom scroll-view that has a specified dimension.
 class FixedSizedScrollView : public views::ScrollView {
@@ skipping 79 matching lines @@
 views::View* CreateDetailedHeaderEntry(int string_id,
                                        ViewClickListener* listener);
 
 // Sets up a Label properly for the tray (sets color, font etc.).
 void SetupLabelForTray(views::Label* label);
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_