Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2006)

Unified Diff: chrome/browser/chromeos/accessibility/accessibility_manager.cc

Issue 2227193002: Make UserScript non-copyable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: uplaod with base Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
}

Powered by Google App Engine
This is Rietveld 408576698