LabelButton: SetAccessibleName on SetText; update test.

ui/views/controls/button/label_button.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 "ui/views/controls/button/label_button.h"
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 17 matching lines @@
 }  // namespace
 
 namespace views {
 
 // static
 const char LabelButton::kViewClassName[] = "views/LabelButton";
 
 LabelButton::LabelButton(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       image_(new ImageView()),
-      label_(new Label(text)),
+      label_(new Label()),
       button_state_images_(),
       button_state_colors_(),
       explicitly_set_colors_(),
       is_default_(false),
       style_(STYLE_TEXTBUTTON) {
   SetAnimationDuration(kHoverAnimationDurationMs);
+  SetText(text);
 
   AddChildView(image_);
   image_->set_interactive(false);
 
   AddChildView(label_);
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   // Initialize the colors, border, and layout.
   SetStyle(style_);
@@ skipping 10 matching lines @@
 void LabelButton::SetImage(ButtonState for_state, const gfx::ImageSkia& image) {
   button_state_images_[for_state] = image;
   image_->SetImage(GetImage(state()));
 }
 
 const string16& LabelButton::GetText() const {
   return label_->text();
 }
 
 void LabelButton::SetText(const string16& text) {
+  SetAccessibleName(text);
   label_->SetText(text);
 }
 
 void LabelButton::SetTextColor(ButtonState for_state, SkColor color) {
   button_state_colors_[for_state] = color;
   if (for_state == STATE_DISABLED)
     label_->SetDisabledColor(color);
   else if (for_state == state())
     label_->SetEnabledColor(color);
   explicitly_set_colors_[for_state] = true;
@@ skipping 33 matching lines @@
 }
 
 void LabelButton::SetStyle(ButtonStyle style) {
   style_ = style;
   set_border(new LabelButtonBorder(style));
   // Inset the button focus rect from the actual border; roughly match Windows.
   if (style == STYLE_TEXTBUTTON || style == STYLE_NATIVE_TEXTBUTTON)
     set_focus_border(FocusBorder::CreateDashedFocusBorder(3, 3, 3, 3));
   if (style == STYLE_BUTTON || style_ == STYLE_NATIVE_TEXTBUTTON)
     label_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  if (style == STYLE_NATIVE_TEXTBUTTON)

[msw, 2013/04/05 01:06:18]

This CL depends on this change from:
https://codereview.chromium.org/13639003/
It's only included here for trybot testing.

+    set_focusable(true);
   if (style == STYLE_BUTTON) {
     set_min_size(gfx::Size(70, 31));
     const SkColor color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_WindowBackground);
     label_->SetShadowColors(color, color);
     label_->SetShadowOffset(0, 1);
   }
   // Invalidate the layout to pickup the new insets from the border.
   InvalidateLayout();
   ResetColorsFromNativeTheme();
@@ skipping 167 matching lines @@
   params->button.indeterminate = false;
   params->button.is_default = is_default_;
   params->button.is_focused = HasFocus() && IsAccessibilityFocusable();
   params->button.has_border = style() == STYLE_NATIVE_TEXTBUTTON;
   params->button.classic_state = 0;
   params->button.background_color = GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 }  // namespace views