extensions/browser/guest_view/web_view/web_view_content_script_manager.h - Issue 2228743002: Rework some UserScriptLoader logic in preparation to removing UserScript copy.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/guest_view/web_view/web_view_content_script_manager.h

Issue 2228743002: Rework some UserScriptLoader logic in preparation to removing UserScript copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sync @tott 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

« no previous file with comments | « extensions/browser/declarative_user_script_master.cc ('k') | extensions/browser/guest_view/web_view/web_view_content_script_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/guest_view/web_view/web_view_content_script_manager.h

diff --git a/extensions/browser/guest_view/web_view/web_view_content_script_manager.h b/extensions/browser/guest_view/web_view/web_view_content_script_manager.h

index e1b72786d083c4927bd64756656a454c0d741fbc..ace0cda6c2734a5e545f878f5f03f231f838bf30 100644

--- a/extensions/browser/guest_view/web_view/web_view_content_script_manager.h

+++ b/extensions/browser/guest_view/web_view/web_view_content_script_manager.h

@@ -44,7 +44,7 @@ class WebViewContentScriptManager : public base::SupportsUserData::Data,

content::RenderFrameHost* render_frame_host,

int view_instance_id,

const HostID& host_id,

- const std::set<UserScript>& user_scripts);

+ const UserScriptList& user_scripts);

// Removes all content scripts for the WebView identified by

// |embedder_process_id| and |view_instance_id|.

@@ -73,7 +73,7 @@ class WebViewContentScriptManager : public base::SupportsUserData::Data,

private:

using GuestMapKey = std::pair<int, int>;

- using ContentScriptMap = std::map<std::string, extensions::UserScript>;

+ using ContentScriptMap = std::map<std::string, UserScriptIDPair>;

using GuestContentScriptMap = std::map<GuestMapKey, ContentScriptMap>;

// UserScriptLoader::Observer implementation: