Change event routers from singletons to being owned by the ExtensionService.

chrome/browser/ui/views/accessibility_event_router_views.cc

 // Copyright (c) 2011 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_event_router_views.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 AccessibilityEventRouterViews::~AccessibilityEventRouterViews() {
 }
 
 // static
 AccessibilityEventRouterViews* AccessibilityEventRouterViews::GetInstance() {
   return Singleton<AccessibilityEventRouterViews>::get();
 }
 
 void AccessibilityEventRouterViews::HandleAccessibilityEvent(
     views::View* view, ui::AccessibilityTypes::Event event_type) {
-  if (!ExtensionAccessibilityEventRouter::GetInstance()->
-      IsAccessibilityEnabled()) {
-    return;
-  }
+  // We check if accessibility is enabled in DispatchAccessibilityNotification,

[dmazzoni, 2011/05/24 18:19:52]

I don't think this comment is needed, it's only helpful when understanding this
changelist. When looking at the code fresh, it's clearer without any comment
here.

+  // after getting the profile for this view.
 
   switch (event_type) {
     case ui::AccessibilityTypes::EVENT_FOCUS:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_CONTROL_FOCUSED);
       break;
     case ui::AccessibilityTypes::EVENT_MENUSTART:
     case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
       DispatchAccessibilityNotification(
           view, NotificationType::ACCESSIBILITY_MENU_OPENED);
@@ skipping 21 matching lines @@
       break;
   }
 }
 
 void AccessibilityEventRouterViews::HandleMenuItemFocused(
     const std::wstring& menu_name,
     const std::wstring& menu_item_name,
     int item_index,
     int item_count,
     bool has_submenu) {
-  if (!ExtensionAccessibilityEventRouter::GetInstance()->
+  if (!most_recent_profile_)
+    return;
+
+  if (!most_recent_profile_->accessibility_event_router()->
       IsAccessibilityEnabled()) {
     return;
   }
 
-  if (!most_recent_profile_)
-    return;
-
   AccessibilityMenuItemInfo info(
       most_recent_profile_,
       WideToUTF8(menu_item_name),
       has_submenu,
       item_index,
       item_count);
   SendAccessibilityNotification(
       NotificationType::ACCESSIBILITY_CONTROL_FOCUSED, &info);
 }
 
@@ skipping 21 matching lines @@
   }
   if (!profile)
     profile = most_recent_profile_;
   if (!profile)
     profile = g_browser_process->profile_manager()->GetDefaultProfile();
   if (!profile) {
     NOTREACHED();
     return;
   }
 
+  if (!profile->accessibility_event_router()->IsAccessibilityEnabled()) {
+    return;
+  }
+
   most_recent_profile_ = profile;
   std::string class_name = view->GetClassName();
 
   if (class_name == views::Checkbox::kViewClassName) {
     SendCheckboxNotification(view, type, profile);
   } else if (class_name == views::MenuButton::kViewClassName ||
       type == NotificationType::ACCESSIBILITY_MENU_OPENED ||
       type == NotificationType::ACCESSIBILITY_MENU_CLOSED) {
     SendMenuNotification(view, type, profile);
   } else if (IsMenuEvent(view, type)) {
@@ skipping 133 matching lines @@
 void AccessibilityEventRouterViews::SendCheckboxNotification(
     views::View* view, NotificationType type, Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string name = UTF16ToUTF8(state.name);
   std::string value = UTF16ToUTF8(state.value);
   AccessibilityCheckboxInfo info(
       profile, name, state.state == ui::AccessibilityTypes::STATE_CHECKED);
   SendAccessibilityNotification(type, &info);
 }
-