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

Unified Diff: extensions/browser/web_ui_user_script_loader.h

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: extensions/browser/web_ui_user_script_loader.h
diff --git a/extensions/browser/web_ui_user_script_loader.h b/extensions/browser/web_ui_user_script_loader.h
index 41e808399d2a7666778d451736c0d5b92b6dbcae..2e90cd4cb2425a746d6e5914537370e100308061 100644
--- a/extensions/browser/web_ui_user_script_loader.h
+++ b/extensions/browser/web_ui_user_script_loader.h
@@ -32,16 +32,17 @@ class WebUIUserScriptLoader : public extensions::UserScriptLoader {
using UserScriptRenderInfoMap = std::map<int, UserScriptRenderInfo>;
// UserScriptLoader:
- void AddScripts(const extensions::UserScriptList& scripts,
+ void AddScripts(extensions::BrowserUserScriptList& scripts,
int render_process_id,
int render_view_id) override;
- void LoadScripts(std::unique_ptr<extensions::UserScriptList> user_scripts,
- const std::set<HostID>& changed_hosts,
- const std::set<int>& added_script_ids,
- LoadScriptsCallback callback) override;
+ void LoadScripts(
+ std::unique_ptr<extensions::BrowserUserScriptList> user_scripts,
+ const std::set<HostID>& changed_hosts,
+ const std::set<int>& added_script_ids,
+ LoadScriptsCallback callback) override;
// Called at the end of each fetch, tracking whether all fetches are done.
- void OnSingleWebUIURLFetchComplete(extensions::UserScript::File* script_file,
+ void OnSingleWebUIURLFetchComplete(extensions::BrowserScriptFile* script_file,
bool success,
const std::string& data);
@@ -49,7 +50,7 @@ class WebUIUserScriptLoader : public extensions::UserScriptLoader {
void OnWebUIURLFetchComplete();
// Creates WebUiURLFetchers for the given |script_files|.
- void CreateWebUIURLFetchers(extensions::UserScript::FileList* script_files,
+ void CreateWebUIURLFetchers(extensions::BrowserScriptFileList* script_files,
content::BrowserContext* browser_context,
int render_process_id,
int render_view_id);
@@ -64,7 +65,7 @@ class WebUIUserScriptLoader : public extensions::UserScriptLoader {
size_t complete_fetchers_;
// Caches |user_scripts_| from UserScriptLoader when loading.
- std::unique_ptr<extensions::UserScriptList> user_scripts_cache_;
+ std::unique_ptr<extensions::BrowserUserScriptList> user_scripts_cache_;
LoadScriptsCallback scripts_loaded_callback_;

Powered by Google App Engine
This is Rietveld 408576698