| Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| index 8dee33378a3c86e0d7c1713a8b918fa7281fa7aa..d43c50c8679a5c0f0c6cf60163ad651bdaab69d9 100644
|
| --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
|
| @@ -262,16 +262,18 @@ void InjectChromeVoxContentScript(
|
| extension->id(), render_view_host->GetProcess()->GetID(),
|
| render_view_host->GetRoutingID());
|
|
|
| - const extensions::UserScriptList& content_scripts =
|
| + const extensions::ScriptMetadataList& content_scripts =
|
| extensions::ContentScriptsInfo::GetContentScripts(extension);
|
| for (size_t i = 0; i < content_scripts.size(); i++) {
|
| - const extensions::UserScript& script = content_scripts[i];
|
| - if (web_contents && !script.MatchesURL(content_url))
|
| + const std::unique_ptr<extensions::ScriptMetadata>& script =
|
| + content_scripts[i];
|
| + if (web_contents && !script->MatchesURL(content_url))
|
| continue;
|
| - for (size_t j = 0; j < script.js_scripts().size(); ++j) {
|
| - const extensions::UserScript::File& file = script.js_scripts()[j];
|
| - extensions::ExtensionResource resource = extension->GetResource(
|
| - file.relative_path());
|
| + for (size_t j = 0; j < script->js_scripts().size(); ++j) {
|
| + const std::unique_ptr<extensions::UserScriptFileInfo>& file =
|
| + script->js_scripts()[j];
|
| + extensions::ExtensionResource resource =
|
| + extension->GetResource(file->relative_path());
|
| loader->AppendScript(resource);
|
| }
|
| }
|
|
|