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

chrome/browser/chromeos/login/wizard_accessibility_helper.h

Index: chrome/browser/chromeos/login/wizard_accessibility_helper.h
===================================================================
--- chrome/browser/chromeos/login/wizard_accessibility_helper.h	(revision 74020)
+++ chrome/browser/chromeos/login/wizard_accessibility_helper.h	(working copy)
@@ -6,13 +6,9 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_ACCESSIBILITY_HELPER_H_
 #pragma once
 
-#include <map>
-#include <vector>
-
 #include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_handler.h"
-#include "chrome/browser/ui/views/accessible_view_helper.h"
 #include "chrome/common/notification_registrar.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
@@ -34,17 +30,6 @@
   // Get accelerator for enabling accessibility.
   static views::Accelerator GetAccelerator();
 
-  // Enables Accessibility by setting the accessibility pref and registers
-  // all views in the view buffer to raise accessibility notifications,
-  // including the specified |view_tree|.
-  void EnableAccessibilityForView(views::View* view_tree);
-
-  // Enables accessibility for the specified |view_tree| if the
-  // accessibility pref is already set. Otherwise the |view_tree| is
-  // added to a view buffer so that accessibility can be enabled for it
-  // later when requested.
-  void MaybeEnableAccessibility(views::View* view_tree);
-
   // Speak the given text if the accessibility pref is already set. |queue|
   // specifies whether this utterance will be queued or spoken immediately.
   // |interruptible| specified whether this utterance can be flushed by a
@@ -55,10 +40,8 @@
   // Unregisters all accessibility notifications
   void UnregisterNotifications();
 
-  // Toggles accessibility support. If |view_tree| is null, only the
-  // access preference setting is toggled. |view_tree| has no effect while
-  // disabling accessibility.
-  void ToggleAccessibility(views::View* view_tree);
+  // Toggles accessibility support.
+  void ToggleAccessibility();
 
  private:
   friend struct DefaultSingletonTraits<WizardAccessibilityHelper>;
@@ -75,12 +58,6 @@
 
   static scoped_ptr<views::Accelerator> accelerator_;
 
-  void AddViewToBuffer(views::View* view_tree);
-
-  std::map<views::View*, bool> views_buffer_;
-
-  std::vector<AccessibleViewHelper*> accessible_view_helpers_;
-
   scoped_ptr<WizardAccessibilityHandler> accessibility_handler_;
 
   Profile* profile_;