Revert of Various changes required to support ChromeVox Next to read Views and Windows.

chrome/browser/ui/ash/accessibility/automation_manager_ash.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/ash/accessibility/automation_manager_ash.h"
 
 #include <vector>
 
 #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_manager.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_context.h"
-#include "ui/aura/window.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"
 
 using content::BrowserContext;
 
 // static
 AutomationManagerAsh* AutomationManagerAsh::GetInstance() {
   return Singleton<AutomationManagerAsh>::get();
@@ skipping 10 matching lines @@
 void AutomationManagerAsh::Disable() {
   enabled_ = false;
 
   // Reset the serializer to save memory.
   current_tree_serializer_->Reset();
 }
 
 void AutomationManagerAsh::HandleEvent(BrowserContext* context,
                                          views::View* view,
                                          ui::AXEvent event_type) {
-  if (!enabled_)
+  if (!enabled_) {
     return;
+  }
 
-  if (!context && g_browser_process->profile_manager())
+  if (!context && g_browser_process->profile_manager()) {
     context = g_browser_process->profile_manager()->GetLastUsedProfile();
-
+  }
   if (!context) {
     LOG(WARNING) << "Accessibility notification but no browser context";
     return;
   }
 
   views::AXAuraObjWrapper* aura_obj =
       views::AXAuraObjCache::GetInstance()->GetOrCreate(view);
   SendEvent(context, aura_obj, event_type);
 }
 
-void AutomationManagerAsh::HandleAlert(content::BrowserContext* context,
-                                       const std::string& text) {
-  if (!enabled_)
-    return;
-
-  views::AXAuraObjWrapper* obj =
-      static_cast<AXRootObjWrapper*>(current_tree_->GetRoot())
-          ->GetAlertForText(text);
-  SendEvent(context, obj, ui::AX_EVENT_ALERT);
-}
-
 void AutomationManagerAsh::DoDefault(int32 id) {
   CHECK(enabled_);
   current_tree_->DoDefault(id);
 }
 
 void AutomationManagerAsh::Focus(int32 id) {
   CHECK(enabled_);
   current_tree_->Focus(id);
 }
 
@@ skipping 31 matching lines @@
                                              update.nodes,
                                              event_type,
                                              aura_obj->GetID(),
                                              0, /* process_id */
                                              0 /* routing_id */);
   std::vector<content::AXEventNotificationDetails> details;
   details.push_back(detail);
   extensions::automation_util::DispatchAccessibilityEventsToAutomation(
       details, context, gfx::Vector2d());
 }