chrome/browser/extensions/user_script_listener.cc - Issue 11724002: Move ContentScripts out of Extension

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/user_script_listener.cc

Issue 11724002: Move ContentScripts out of Extension (Closed) Base URL: http://git.chromium.org/chromium/src.git@dc_unref_browser_action

Patch Set: Created 7 years, 12 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/extension_service_unittest.cc ('k') | chrome/browser/extensions/user_script_master.cc » ('j') | chrome/common/extensions/extension_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/user_script_listener.cc

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

index 1cb33d879500dcf33bda09201f907db13a174706..81356264f830e2c606016583cf063a572c6875ec 100644

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

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

@@ -8,6 +8,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"

#include "chrome/common/extensions/extension.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

@@ -185,7 +186,8 @@ void UserScriptListener::CollectURLPatterns(const Extension* extension,

URLPatterns* patterns) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- const UserScriptList& scripts = extension->content_scripts();

+ const UserScriptList& scripts =

+ ContentScriptsInfo::GetContentScripts(extension);

for (UserScriptList::const_iterator iter = scripts.begin();

iter != scripts.end(); ++iter) {

patterns->insert(patterns->end(),

@@ -204,7 +206,7 @@ void UserScriptListener::Observe(int type,

Profile* profile = content::Source<Profile>(source).ptr();

const Extension* extension =

content::Details<const Extension>(details).ptr();

- if (extension->content_scripts().empty())

+ if (ContentScriptsInfo::GetContentScripts(extension).empty())

return; // no new patterns from this extension.

URLPatterns new_patterns;

@@ -221,7 +223,7 @@ void UserScriptListener::Observe(int type,

Profile* profile = content::Source<Profile>(source).ptr();

const Extension* unloaded_extension =

content::Details<UnloadedExtensionInfo>(details)->extension;

- if (unloaded_extension->content_scripts().empty())

+ if (ContentScriptsInfo::GetContentScripts(unloaded_extension).empty())

return; // no patterns to delete for this extension.

// Clear all our patterns and reregister all the still-loaded extensions.