Adds support and exposure of additional accessibility roles. Includes naming ...

views/controls/image_view.cc

 // Copyright (c) 2006-2008 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 "app/gfx/canvas.h"
 #include "app/gfx/insets.h"
 #include "base/logging.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) {
+  if (tooltip_text_.empty()) {
+    return false;
+  } else {
+    *name = GetTooltipText();

[sky, 2009/08/21 21:33:39]

Both of these should be consistent. Either use tooltip_text_ in both, or
GetTooltipText in both. Would also be nice if the format of this matched
GetAccessibleRole, eg:

if (!tooltip_text_.empty())
  return false;
...

+    return true;
+  }
+}
+
+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_) {
     horiz_alignment_ = ha;
     SchedulePaint();
   }
 }
 
 ImageView::Alignment ImageView::GetHorizontalAlignment() {
   return horiz_alignment_;
 }
@@ skipping 14 matching lines @@
 }
 
 std::wstring ImageView::GetTooltipText() {
   return tooltip_text_;
 }
 
 bool ImageView::GetTooltipText(int x, int y, std::wstring* tooltip) {
   if (tooltip_text_.empty()) {
     return false;
   } else {
-    * tooltip =  GetTooltipText();
+    *tooltip = GetTooltipText();
     return true;
   }
 }
 
 }  // namespace views