Fix Regression for Accessible Names

views/controls/image_view.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/image_view.h"
 
 #include "base/logging.h"
 #include "gfx/canvas.h"
 #include "gfx/insets.h"
 
@@ skipping 118 matching lines @@
     paint.setFilterBitmap(true);
     canvas->DrawBitmapInt(image_, 0, 0, image_width, image_height,
                           x, y, image_size_.width(), image_size_.height(),
                           true, paint);
   } else {
     ComputeImageOrigin(image_width, image_height, &x, &y);
     canvas->DrawBitmapInt(image_, x, y);
   }
 }
 
-bool ImageView::GetAccessibleName(std::wstring* name) {
-  DCHECK(name);
-  *name = tooltip_text_;
-  return !name->empty();
-}
-
 bool ImageView::GetAccessibleRole(AccessibilityTypes::Role* role) {
   if (!role)
     return false;
 
   *role = AccessibilityTypes::ROLE_GRAPHIC;
   return true;
 }
 
 void ImageView::SetHorizontalAlignment(Alignment ha) {
   if (ha != horiz_alignment_) {
@@ skipping 12 matching lines @@
     SchedulePaint();
   }
 }
 
 ImageView::Alignment ImageView::GetVerticalAlignment() {
   return vert_alignment_;
 }
 
 void ImageView::SetTooltipText(const std::wstring& tooltip) {
   tooltip_text_ = tooltip;
+  SetAccessibleName(tooltip);
 }
 
 std::wstring ImageView::GetTooltipText() {
   return tooltip_text_;
 }
 
 bool ImageView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   if (tooltip_text_.empty())
     return false;
 
   *tooltip = GetTooltipText();
   return true;
 }
 
 }  // namespace views