Remove old accessibility enums, finish renaming public interface.

Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 23 matching lines @@
 
 #include "ColorChooserPopupUIController.h"
 #include "ColorChooserUIController.h"
 #include "DateTimeChooserImpl.h"
 #include "ExternalDateTimeChooser.h"
 #include "ExternalPopupMenu.h"
 #include "HTMLNames.h"
 #include "PopupContainer.h"
 #include "PopupMenuChromium.h"
 #include "RuntimeEnabledFeatures.h"
-#include "WebAccessibilityObject.h"
+#include "WebAXObject.h"
 #include "WebAutofillClient.h"
 #include "WebColorChooser.h"
 #include "WebConsoleMessage.h"
 #include "WebCursorInfo.h"
 #include "WebFileChooserCompletionImpl.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebInputElement.h"
 #include "WebInputEvent.h"
 #include "WebKit.h"
@@ skipping 59 matching lines @@
     case PopupContainer::Select:
         return WebPopupTypeSelect;
     case PopupContainer::Suggestion:
         return WebPopupTypeSuggestion;
     default:
         ASSERT_NOT_REACHED();
         return WebPopupTypeNone;
     }
 }
 
-// Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAccessibilityNotification
-static WebAccessibilityNotification toWebAccessibilityNotification(AXObjectCache::AXNotification notification)
-{
-    // These enums have the same values; enforced in AssertMatchingEnums.cpp.
-    return static_cast<WebAccessibilityNotification>(notification);
-}
-
 // Converts a WebCore::AXObjectCache::AXNotification to a WebKit::WebAXEvent
 static WebAXEvent toWebAXEvent(AXObjectCache::AXNotification notification)
 {
     // These enums have the same values; enforced in AssertMatchingEnums.cpp.
     return static_cast<WebAXEvent>(notification);
 }
 
 ChromeClientImpl::ChromeClientImpl(WebViewImpl* webView)
     : m_webView(webView)
     , m_toolbarsVisible(true)
@@ skipping 657 matching lines @@
         }
     }
 
     info->itemHeight = popupContainer->menuItemHeight();
     info->itemFontSize = popupContainer->menuItemFontSize();
     info->selectedIndex = popupContainer->selectedIndex();
     info->items.swap(outputItems);
     info->rightAligned = popupContainer->menuStyle().textDirection() == RTL;
 }
 
 void ChromeClientImpl::postAccessibilityNotification(AccessibilityObject* obj, AXObjectCache::AXNotification notification)

[aboxhall, 2013/09/03 16:26:23]

Should we s/notification/event/ here at any point?

[dmazzoni, 2013/09/06 19:53:32]

Agreed.

 {
     // Alert assistive technology about the accessibility object notification.
     if (!obj)
         return;
 
-    // FIXME: Remove this first call once Chromium has switched over to using the second. (http://crbug.com/269034)
-    m_webView->client()->postAccessibilityNotification(WebAccessibilityObject(obj), toWebAccessibilityNotification(notification));
-    m_webView->client()->postAccessibilityEvent(WebAccessibilityObject(obj), toWebAXEvent(notification));
+    m_webView->client()->postAccessibilityEvent(WebAXObject(obj), toWebAXEvent(notification));

[jamesr, 2013/09/03 21:52:42]

another inconsistency:

postAccessibilityEvent ... WebAXEvent

is an AccessibilityEvent or an AXEvent?

[dmazzoni, 2013/09/06 19:53:32]

I prefer postAccessibilityEvent, but not strongly

 }
 
 String ChromeClientImpl::acceptLanguages()
 {
     return m_webView->client()->acceptLanguages();
 }
 
 bool ChromeClientImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
 {
     Frame* frame = m_webView->mainFrameImpl()->frame();
@@ skipping 189 matching lines @@
 {
 }
 
 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& scheme, const String& baseURL, const String& url, const String& title)
 {
     m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
 }
 #endif
 
 } // namespace WebKit