chrome/browser/extensions/active_script_controller.cc - Issue 939803002: [Extensions] Update renderers when all-urls is granted

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: chrome/browser/extensions/active_script_controller.cc

Issue 939803002: [Extensions] Update renderers when all-urls is granted (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test Created 5 years, 10 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 | « chrome/browser/extensions/active_script_controller.h ('k') | chrome/browser/extensions/active_script_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/active_script_controller.cc

diff --git a/chrome/browser/extensions/active_script_controller.cc b/chrome/browser/extensions/active_script_controller.cc

index 3efa950071f7e1830cbe18624acf189ceab2432e..c3e9956b60989bd3c9bc9fdb48690b16b187cbe0 100644

--- a/chrome/browser/extensions/active_script_controller.cc

+++ b/chrome/browser/extensions/active_script_controller.cc

@@ -39,6 +39,7 @@ namespace extensions {

ActiveScriptController::ActiveScriptController(

content::WebContents* web_contents)

: content::WebContentsObserver(web_contents),

+ num_page_requests_(0),

browser_context_(web_contents->GetBrowserContext()),

was_used_on_page_(false),

extension_registry_observer_(this) {

@@ -237,6 +238,8 @@ void ActiveScriptController::OnRequestScriptInjectionPermission(

return;

}

+ ++num_page_requests_;

switch (RequiresUserConsentForScriptInjection(extension, script_type)) {

case PermissionsData::ACCESS_ALLOWED:

PermitScriptInjection(request_id);

@@ -315,6 +318,7 @@ void ActiveScriptController::DidNavigateMainFrame(

return;

LogUMA();

+ num_page_requests_ = 0;

permitted_extensions_.clear();

pending_requests_.clear();

was_used_on_page_ = false;