Fix Regression for Accessible Names

views/controls/label.cc

 // Copyright (c) 2010 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 "views/controls/label.h"
 
 #include <cmath>
 #include <limits>
 
 #include "app/l10n_util.h"
@@ skipping 101 matching lines @@
 void Label::SetFont(const gfx::Font& font) {
   font_ = font;
   text_size_valid_ = false;
   SchedulePaint();
 }
 
 void Label::SetText(const std::wstring& text) {
   text_ = text;
   url_set_ = false;
   text_size_valid_ = false;
+  SetAccessibleName(text);
   SchedulePaint();
 }
 
 const std::wstring Label::GetText() const {
   return url_set_ ? UTF8ToWide(url_.spec()) : text_;
 }
 
 void Label::SetURL(const GURL& url) {
   url_ = url;
   text_ = UTF8ToWide(url_.spec());
@@ skipping 112 matching lines @@
   SizeToPreferredSize();
 }
 
 bool Label::GetAccessibleRole(AccessibilityTypes::Role* role) {
   DCHECK(role);
 
   *role = AccessibilityTypes::ROLE_TEXT;
   return true;
 }
 
-bool Label::GetAccessibleName(std::wstring* name) {
-  DCHECK(name);
-  *name = GetText();
-  return !name->empty();
-}
-
 bool Label::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
 
   *state = AccessibilityTypes::STATE_READONLY;
   return true;
 }
 
 void Label::SetHasFocusBorder(bool has_focus_border) {
   has_focus_border_ = has_focus_border;
   text_size_valid_ &= !is_multi_line_;
@@ skipping 155 matching lines @@
 }
 
 gfx::Rect Label::GetAvailableRect() const {
   gfx::Rect bounds(gfx::Point(), size());
   gfx::Insets insets(GetInsets());
   bounds.Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
   return bounds;
 }
 
 }  // namespace views