Add an accessible name to the restart button

ash/system/tray/tray_views.cc

 // 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.
 
 #include "ash/system/tray/tray_views.h"
 
 #include "ash/system/tray/tray_constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "grit/ash_strings.h"
 #include "grit/ui_resources.h"
@@ skipping 48 matching lines @@
       event.key_code() == ui::VKEY_RETURN) {
     return PerformAction(event);
   }
   return false;
 }
 
 bool ActionableView::OnMousePressed(const views::MouseEvent& event) {
   return PerformAction(event);
 }
 
+void ActionableView::SetAccessibleName(const string16& name) {
+  accessible_name_ = name;
+}
+
 void ActionableView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   if (HasFocus() && (focusable() || IsAccessibilityFocusable())) {
     canvas->DrawRect(gfx::Rect(1, 1, width() - 3, height() - 3),
                      kFocusBorderColor);
   }
 }
 
+void ActionableView::GetAccessibleState(ui::AccessibleViewState* state) {
+  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->name = accessible_name_;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HoverHighlightView
 
 HoverHighlightView::HoverHighlightView(ViewClickListener* listener)
     : listener_(listener),
       highlight_color_(kHoverBackgroundColor),
       default_color_(0),
       fixed_height_(0),
       hover_(false) {
   set_notify_enter_exit_on_child(true);
 }
 
 HoverHighlightView::~HoverHighlightView() {
 }
 
 void HoverHighlightView::AddIconAndLabel(const SkBitmap& image,
                                          const string16& text,
                                          gfx::Font::FontStyle style) {
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 3, kIconPaddingLeft));
   views::ImageView* image_view =
       new FixedSizedImageView(kTrayPopupDetailsIconWidth, 0);
   image_view->SetImage(image);
   AddChildView(image_view);
 
   views::Label* label = new views::Label(text);
   label->SetFont(label->font().DeriveFont(0, style));
   AddChildView(label);
 
-  accessible_name_ = text;
+  SetAccessibleName(text);
 }
 
 void HoverHighlightView::AddLabel(const string16& text,
                                   gfx::Font::FontStyle style) {
   SetLayoutManager(new views::FillLayout());
   views::Label* label = new views::Label(text);
   label->set_border(views::Border::CreateEmptyBorder(
       5, kTrayPopupDetailsIconWidth + kIconPaddingLeft, 5, 0));
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   label->SetFont(label->font().DeriveFont(0, style));
   label->SetDisabledColor(SkColorSetARGB(127, 0, 0, 0));
   AddChildView(label);
 
-  accessible_name_ = text;
-}
-
-void HoverHighlightView::SetAccessibleName(const string16& name) {
-  accessible_name_ = name;
+  SetAccessibleName(text);
 }
 
 bool HoverHighlightView::PerformAction(const views::Event& event) {
   if (!listener_)
     return false;
   listener_->ClickedOn(this);
   return true;
 }
 
 gfx::Size HoverHighlightView::GetPreferredSize() {
   gfx::Size size = ActionableView::GetPreferredSize();
   if (fixed_height_)
     size.set_height(fixed_height_);
   return size;
 }
 
 void HoverHighlightView::OnMouseEntered(const views::MouseEvent& event) {
   hover_ = true;
   SchedulePaint();
 }
 
 void HoverHighlightView::OnMouseExited(const views::MouseEvent& event) {
   hover_ = false;
   SchedulePaint();
 }
 
-void HoverHighlightView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
-  state->name = accessible_name_;
-}
-
 void HoverHighlightView::OnEnabledChanged() {
   for (int i = 0; i < child_count(); ++i)
     child_at(i)->SetEnabled(enabled());
 }
 
 void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) {
   canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 175 matching lines @@
   label->SetAutoColorReadabilityEnabled(false);
   label->SetEnabledColor(SK_ColorWHITE);
   label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   label->SetShadowColors(SkColorSetARGB(64, 0, 0, 0),
                          SkColorSetARGB(64, 0, 0, 0));
   label->SetShadowOffset(0, 1);
 }
 
 }  // namespace internal
 }  // namespace ash