Beginning of an accessibility implementation for html_viewer.

mojo/services/html_viewer/html_document_view.h

Index: mojo/services/html_viewer/html_document_view.h
diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
index 68314854b098367548af6ac27304106fe90791aa..d1cd1eb5c116b3c9c271a3fabbcdc0fefc517b3e 100644
--- a/mojo/services/html_viewer/html_document_view.h
+++ b/mojo/services/html_viewer/html_document_view.h
@@ -5,12 +5,15 @@
 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
 
+#include <set>
+
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
+#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/public/cpp/bindings/interface_impl.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
+#include "mojo/services/html_viewer/ax_provider_impl.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
@@ -26,6 +29,7 @@ class MessageLoopProxy;
 
 namespace mojo {
 
+class AxProviderImpl;
 class WebMediaPlayerFactory;
 class ViewManager;
 class View;
@@ -36,7 +40,8 @@ class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
                          public blink::WebViewClient,
                          public blink::WebFrameClient,
                          public ViewManagerDelegate,
-                         public ViewObserver {
+                         public ViewObserver,
+                         public InterfaceFactory<AxProvider> {
  public:
   // Load a new HTMLDocument with |response|.
   //
@@ -107,6 +112,10 @@ class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
   void OnViewDestroyed(View* view) override;
   void OnViewInputEvent(View* view, const EventPtr& event) override;
 
+  // InterfaceFactory<AxProvider>
+  void Create(ApplicationConnection* connection,
+              InterfaceRequest<AxProvider> request) override;
+
   void Load(URLResponsePtr response);
 
   URLResponsePtr response_;
@@ -121,7 +130,9 @@ class HTMLDocumentView : public mojo::InterfaceImpl<mojo::Application>,
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 
-  base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
+  // HTMLDocumentView owns these pointers.
+  std::set<AxProviderImpl*> ax_provider_impls_;

[abarth-chromium, 2014/11/10 00:33:04]

There's no set equivalent for ScopedVector in base?  It's sad we can't use C++11
collections yet.

[Aaron Boodman, 2014/11/10 07:05:53]

nope.
yup. I could use linked_ptr, but there's some debate about whether that's a good
idea. STLDeleteElements() is less contentious.

+
   DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
 };