| Index: chrome/browser/extensions/component_loader.cc
|
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
|
| index 7194f45bc34b3961e6da704ed2b17d75a21db4ee..e6cb35ca234f3645ed8b08e5af59a91ac4eb24c1 100644
|
| --- a/chrome/browser/extensions/component_loader.cc
|
| +++ b/chrome/browser/extensions/component_loader.cc
|
| @@ -33,6 +33,7 @@
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| +#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| @@ -414,7 +415,8 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
|
| }
|
|
|
| // Load ChromeVox extension now if spoken feedback is enabled.
|
| - if (local_state_->GetBoolean(prefs::kSpokenFeedbackEnabled)) {
|
| + if (chromeos::AccessibilityManager::Get() &&
|
| + chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled()) {
|
| base::FilePath path =
|
| base::FilePath(extension_misc::kChromeVoxExtensionPath);
|
| Add(IDR_CHROMEVOX_MANIFEST, path);
|
|
|