Service provider

Author: yaakovschectman

shell/platform/windows/accessibility_root_node.cc

@@ -254,44 +254,6 @@ IFACEMETHODIMP AccessibilityRootNode::put_accName(VARIANT var_id,
   return E_NOTIMPL;
 }
 
-//
-// Methods used by the ATL COM map.
-//
-
-// static
-STDMETHODIMP AccessibilityRootNode::InternalQueryInterface(
-    void* this_ptr,
-    const _ATL_INTMAP_ENTRY* entries,
-    REFIID riid,
-    void** object) {
-  if (!object)
-    return E_INVALIDARG;
-  *object = nullptr;
-  AccessibilityRootNode* accessible =
-      reinterpret_cast<AccessibilityRootNode*>(this_ptr);
-  if (!accessible) {
-    return E_FAIL;
-  }
-
-  return CComObjectRootBase::InternalQueryInterface(this_ptr, entries, riid,
-                                                    object);
-}
-
-// static
-STDMETHODIMP AccessibilityRootNode::QueryInterface(REFIID riid, LPVOID* obj) throw() {
-  if (!obj) {
-    return E_INVALIDARG;
-  }
-  FML_LOG(ERROR) << "Querying for " << riid.Data1 << riid.Data2 << riid.Data3 << riid.Data4;
-  *obj = NULL;
-  if (riid == IID_IUnknown || riid == IID_IAccessible) {
-    *obj = (LPVOID)this;
-    AddRef();
-    return S_OK;
-  }
-  return E_NOINTERFACE;
-}
-
 //
 // IServiceProvider implementation.
 //

shell/platform/windows/accessibility_root_node.h

@@ -104,15 +104,9 @@ class __declspec(uuid("12344321-1234-4321-1234-aaaaaaaaaaaa")) AccessibilityRoot
   IFACEMETHODIMP put_accName(VARIANT var_id, BSTR put_name) override;
 
   //
-  // Methods used by the ATL COM map.
+  // IServiceProvider method.
   //
 
-  // Called by BEGIN_COM_MAP() / END_COM_MAP().
-  static STDMETHODIMP InternalQueryInterface(void* this_ptr,
-                                             const _ATL_INTMAP_ENTRY* entries,
-                                             REFIID riid,
-                                             void** object);
-
   IFACEMETHODIMP QueryService(REFGUID guidService,
                                                REFIID riid,
                                                void** object) override;