Support accDoDefaultAction for NativeButton in ViewAccessibility....

views/accessibility/view_accessibility.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/accessibility/view_accessibility.h"
 
 #include "app/view_prop.h"
+#include "views/controls/button/native_button.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_win.h"
 
 const char kViewsNativeHostPropForAccessibility[] =
     "Views_NativeViewHostHWNDForAccessibility";
 
 // static
 scoped_refptr<ViewAccessibility> ViewAccessibility::Create(views::View* view) {
   CComObject<ViewAccessibility>* instance = NULL;
   HRESULT hr = CComObject<ViewAccessibility>::CreateInstance(&instance);
@@ skipping 58 matching lines @@
     child->vt = VT_I4;
     child->lVal = CHILDID_SELF;
   } else {
     child->vt = VT_DISPATCH;
     child->pdispVal = GetAccessibleForView(view);
     child->pdispVal->AddRef();
   }
   return S_OK;
 }
 
+HRESULT ViewAccessibility::accDoDefaultAction(VARIANT var_id) {
+  if (!IsValidId(var_id))
+    return E_INVALIDARG;
+
+  if (view_->GetClassName() == views::NativeButton::kViewClassName) {
+    views::NativeButton* native_button =
+        static_cast<views::NativeButton*>(view_);
+    native_button->ButtonPressed();
+    return S_OK;
+  }
+
+  // The object does not support the method. This value is returned for
+  // controls that do not perform actions, such as edit fields.
+  return DISP_E_MEMBERNOTFOUND;
+}
+
 STDMETHODIMP ViewAccessibility::accLocation(
     LONG* x_left, LONG* y_top, LONG* width, LONG* height, VARIANT var_id) {
   if (!IsValidId(var_id) || !x_left || !y_top || !width || !height)
     return E_INVALIDARG;
 
   if (!view_)
     return E_FAIL;
 
   gfx::Rect view_bounds;
   // Retrieving the parent View to be used for converting from view-to-screen
@@ skipping 432 matching lines @@
 
   if (view->HasFocus())
     msaa_state->lVal |= STATE_SYSTEM_FOCUSED;
 
   // Add on any view-specific states.
   msaa_state->lVal |= MSAAState(view->GetAccessibleState());
 }
 
 // IAccessible functions not supported.
 
-HRESULT ViewAccessibility::accDoDefaultAction(VARIANT var_id) {
-  return E_NOTIMPL;
-}
-
 STDMETHODIMP ViewAccessibility::get_accSelection(VARIANT* selected) {
   if (selected)
     selected->vt = VT_EMPTY;
   return E_NOTIMPL;
 }
 
 STDMETHODIMP ViewAccessibility::accSelect(LONG flagsSelect, VARIANT var_id) {
   return E_NOTIMPL;
 }
 
@@ skipping 174 matching lines @@
     HWND native_view_window , IAccessible** accessible) {
   if (IsWindow(native_view_window)) {
     LRESULT ret = SendMessage(native_view_window, WM_GETOBJECT, 0,
                               OBJID_CLIENT);
     return ObjectFromLresult(ret, IID_IDispatch, 0,
                              reinterpret_cast<void**>(accessible));
   }
 
   return E_FAIL;
 }