Map Views to Profiles directly from their window, eliminating the need...

chrome/browser/ui/views/accessibility_event_router_views.h

Index: chrome/browser/ui/views/accessibility_event_router_views.h
===================================================================
--- chrome/browser/ui/views/accessibility_event_router_views.h	(revision 74020)
+++ chrome/browser/ui/views/accessibility_event_router_views.h	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,6 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/hash_tables.h"
 #include "base/singleton.h"
 #include "base/task.h"
 #include "chrome/browser/accessibility_events.h"
@@ -21,18 +20,6 @@
 class View;
 }
 
-// Allows us to use (View*) in a hash_map with gcc.
-#if defined(COMPILER_GCC)
-namespace __gnu_cxx {
-template<>
-struct hash<views::View*> {
-  size_t operator()(views::View* view) const {
-    return reinterpret_cast<size_t>(view);
-  }
-};
-}  // namespace __gnu_cxx
-#endif  // defined(COMPILER_GCC)
-
 // NOTE: This class is part of the Accessibility Extension API, which lets
 // extensions receive accessibility events. It's distinct from code that
 // implements platform accessibility APIs like MSAA or ATK.
@@ -65,27 +52,6 @@
   // Get the single instance of this class.
   static AccessibilityEventRouterViews* GetInstance();
 
-  // Start sending accessibility events for this view and all of its
-  // descendants.  Notifications will go to the specified profile.
-  // Returns true on success, false if "view" was already registered.
-  // It is the responsibility of the caller to call RemoveViewTree if
-  // this view is ever deleted; consider using AccessibleViewHelper.
-  bool AddViewTree(views::View* view, Profile* profile);
-
-  // Stop sending accessibility events for this view and all of its
-  // descendants.
-  void RemoveViewTree(views::View* view);
-
-  // Don't send any events for this view.
-  void IgnoreView(views::View* view);
-
-  // Use the following string as the name of this view, instead of the
-  // gtk label associated with the view.
-  void SetViewName(views::View* view, std::string name);
-
-  // Forget all information about this view.
-  void RemoveView(views::View* view);
-
   // Handle an accessibility event generated by a view.
   void HandleAccessibilityEvent(
       views::View* view, AccessibilityTypes::Event event_type);
@@ -98,10 +64,6 @@
   FRIEND_TEST_ALL_PREFIXES(AccessibilityEventRouterViewsTest,
                            TestFocusNotification);
 
-  // Given a view, determine if it's part of a view tree that's mapped to
-  // a profile and if so, if it's marked as accessible.
-  void FindView(views::View* view, Profile** profile, bool* is_accessible);
-
   // Checks the type of the view and calls one of the more specific
   // Send*Notification methods, below.
   void DispatchAccessibilityNotification(
@@ -134,13 +96,6 @@
   void RecursiveGetMenuItemIndexAndCount(
       views::View* menu, views::View* item, int* index, int* count);
 
-  // The set of all view tree roots; only descendants of these will generate
-  // accessibility notifications.
-  base::hash_map<views::View*, Profile*> view_tree_profile_map_;
-
-  // Extra information about specific views.
-  base::hash_map<views::View*, ViewInfo> view_info_map_;
-
   // The profile associated with the most recent window event  - used to
   // figure out where to route a few events that can't be directly traced
   // to a window with a profile (like menu events).