Extend AXTreeSourceViews to handle aura::Window and views::Widget.

chrome/browser/ui/views/accessibility/automation_manager_views.cc

 // Copyright 2014 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 "chrome/browser/ui/views/accessibility/automation_manager_views.h"
 
 #include <vector>
 
-#include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/ax_event_notification_details.h"
+#include "ui/views/accessibility/ax_aura_obj_cache.h"
+#include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 // static
 AutomationManagerViews* AutomationManagerViews::GetInstance() {
   return Singleton<AutomationManagerViews>::get();
 }
 
+void AutomationManagerViews::Enable() {
+  enabled_ = true;
+  if (current_tree_serializer_.get())

[aboxhall, 2014/04/28 19:50:38]

Why reset when Enable() is called, rather than Disable()?

[David Tseng, 2014/04/29 01:35:03]

In case Enable() gets called by multiple clients. I can add a TODO here for that
particular case, but it is under specified in the API in general.

For example,
client1 calls getDesktop()
focus moves somewhere
serializer has marked the entire tree as serialized
client2 calls getDesktop()
This client should get the entire tree (but wouldn't if we didn't Reset).

+    current_tree_serializer_->Reset();
+}
+
+void AutomationManagerViews::Disable() {
+  enabled_ = false;
+}
+
 void AutomationManagerViews::HandleEvent(Profile* profile,
                                          views::View* view,
                                          ui::AXEvent event_type) {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableAutomationAPI)) {
+  if (!enabled_) {
     return;
   }
 
   // TODO(dtseng): Events should only be delivered to extensions with the
   // desktop permission.
   views::Widget* widget = view->GetWidget();
   if (!widget)
     return;
 
   if (!profile && g_browser_process->profile_manager()) {
     profile = g_browser_process->profile_manager()->GetLastUsedProfile();
   }
   if (!profile) {
     LOG(WARNING) << "Accessibility notification but no profile";
     return;
   }
 
-  if (!current_tree_.get() ||
-      current_tree_->GetRoot()->GetWidget() != widget) {
-    current_tree_.reset(new views::AXTreeSourceViews(widget));
+  if (!current_tree_.get()) {
+    current_tree_.reset(new AXTreeSourceViews());
     current_tree_serializer_.reset(
-        new ui::AXTreeSerializer<views::View*>(current_tree_.get()));
-    // TODO(dtseng): Need to send a load complete and clear any previous desktop
-    // trees.
+        new ui::AXTreeSerializer<views::AXAuraObjWrapper*>(
+            current_tree_.get()));
   }
 
   ui::AXTreeUpdate out_update;
-  current_tree_serializer_->SerializeChanges(view, &out_update);
+  views::AXAuraObjWrapper* obj =

[aboxhall, 2014/04/28 19:50:38]

Could we call this aura_obj or similar?

[David Tseng, 2014/04/29 01:35:03]

Done.

+      views::AXAuraObjCache::GetInstance()->GetOrCreate(view);
+  current_tree_serializer_->SerializeChanges(obj, &out_update);
 
   // Route this event to special process/routing ids recognized by the
   // Automation API as the desktop tree.
-
   // TODO(dtseng): Would idealy define these special desktop constants in idl.
   content::AXEventNotificationDetails detail(out_update.nodes,
                                              event_type,
-                                             current_tree_->GetId(view),
+                                             obj->GetID(),
                                              0, /* process_id */
                                              0 /* routing_id */);
   std::vector<content::AXEventNotificationDetails> details;
   details.push_back(detail);
   extensions::automation_util::DispatchAccessibilityEventsToAutomation(
       details, profile);
 }
 
-AutomationManagerViews::AutomationManagerViews() {}
+AutomationManagerViews::AutomationManagerViews() : enabled_(false) {}
 
 AutomationManagerViews::  ~AutomationManagerViews() {}