Initialize ExtensionAccessibilityEventRouter earlier.

chrome/browser/extensions/extension_accessibility_api.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/extensions/extension_tabs_module.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 23 matching lines @@
   base::JSONWriter::Write(&args, false, &json_args);
   return json_args;
 }
 
 ExtensionAccessibilityEventRouter*
     ExtensionAccessibilityEventRouter::GetInstance() {
   return Singleton<ExtensionAccessibilityEventRouter>::get();
 }
 
 ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
-    : enabled_(false) {}
+    : enabled_(false) {
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
+                 NotificationService::AllSources());
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED,
+                 NotificationService::AllSources());
+}
 
 ExtensionAccessibilityEventRouter::~ExtensionAccessibilityEventRouter() {
   STLDeleteElements(&on_enabled_listeners_);
   STLDeleteElements(&on_disabled_listeners_);
 }
 
-void ExtensionAccessibilityEventRouter::ObserveProfile(Profile* profile) {
-  last_focused_control_dict_.Clear();
-
-  if (registrar_.IsEmpty()) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
-                   NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED,
-                   NotificationService::AllSources());
-  }
-}
-
 void ExtensionAccessibilityEventRouter::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED:
       OnWindowOpened(Details<const AccessibilityWindowInfo>(details).ptr());
       break;
     case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED:
       OnWindowClosed(Details<const AccessibilityWindowInfo>(details).ptr());
@@ skipping 126 matching lines @@
       ExtensionAccessibilityEventRouter::GetInstance();
   DictionaryValue *last_focused_control_dict =
       accessibility_event_router->last_focused_control_dict();
   if (last_focused_control_dict->size()) {
     result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
   } else {
     result_.reset(Value::CreateNullValue());
   }
   return true;
 }