Re-land: Move ChromeVox loading out of ComponentLoader.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

 // Copyright (c) 2013 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/chromeos/accessibility/accessibility_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 195 matching lines @@
   int render_view_id_;
   std::queue<extensions::ExtensionResource> resources_;
 };
 
 void InjectChromeVoxContentScript(
     ExtensionService* extension_service,
     int render_process_id,
     int render_view_id,
     const base::Closure& done_cb);
 
+void AddChromeVoxExtensionToComponentLoader(
+    extensions::ComponentLoader* component_loader,
+    base::Closure done_cb) {
+  component_loader->AddComponentFromDir(
+      GetChromeVoxPath(), extension_misc::kChromeVoxExtensionId, done_cb);
+}
+
 void LoadChromeVoxExtension(
     Profile* profile,
     RenderViewHost* render_view_host,
     base::Closure done_cb) {
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (render_view_host) {
     // Wrap the passed in callback to inject the content script.
     done_cb = base::Bind(
         &InjectChromeVoxContentScript,
         extension_service,
         render_view_host->GetProcess()->GetID(),
         render_view_host->GetRoutingID(),
         done_cb);
   }
-  extension_service->component_loader()->AddChromeVoxExtension(done_cb);
+
+  AddChromeVoxExtensionToComponentLoader(extension_service->component_loader(),
+                                         done_cb);
 }
 
 void InjectChromeVoxContentScript(
     ExtensionService* extension_service,
     int render_process_id,
     int render_view_id,
     const base::Closure& done_cb) {
   // Make sure to always run |done_cb|.  ChromeVox was loaded even if we end up
   // not injecting into this particular render view.
   base::ScopedClosureRunner done_runner(done_cb);
@@ skipping 365 matching lines @@
   spoken_feedback_notification_ = ash::A11Y_NOTIFICATION_NONE;
 }
 
 void AccessibilityManager::UpdateSpokenFeedbackFromPref() {
   if (!profile_)
     return;
 
   const bool enabled = profile_->GetPrefs()->GetBoolean(
       prefs::kAccessibilitySpokenFeedbackEnabled);
 
+  // If ChromeVox was already enabled, but not for this profile,
+  // add it to this profile.
+  auto* extension_service =
+      extensions::ExtensionSystem::Get(profile_)->extension_service();
+  auto* component_loader = extension_service->component_loader();
+  bool is_already_loaded =
+      component_loader->Exists(extension_misc::kChromeVoxExtensionId);
+  if (spoken_feedback_enabled_ && enabled && !is_already_loaded)
+    AddChromeVoxExtensionToComponentLoader(component_loader, base::Closure());
+
   if (spoken_feedback_enabled_ == enabled)
     return;
 
   spoken_feedback_enabled_ = enabled;
 
   AccessibilityStatusEventDetails details(
       ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK,
       enabled,
       spoken_feedback_notification_);
 
@@ skipping 916 matching lines @@
     content::BrowserContext* context) {
   keyboard_listener_extension_id_ = id;
 
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(context);
   if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
     extension_registry_observer_.Add(registry);
 }
 
 }  // namespace chromeos