chrome/common/extensions/manifest_handlers/content_scripts_handler.cc - Issue 309533007: Refactor PermissionsData pt1

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/common/extensions/manifest_handlers/content_scripts_handler.cc

Issue 309533007: Refactor PermissionsData pt1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 7 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

« chrome/common/extensions/extension_unittest.cc ('K') | « chrome/common/extensions/manifest_handlers/app_isolation_info.cc ('k') | chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc » ('j') | chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

index 5ca9f9af2275696e7e7645248e846b1358daefa4..353dd6619ff4b7470cb009f7b204f7af520d97e9 100644

--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

+++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

@@ -16,6 +16,7 @@

#include "extensions/common/extension.h"

#include "extensions/common/extension_resource.h"

#include "extensions/common/manifest_constants.h"

+#include "extensions/common/manifest_handlers/permissions_parser.h"

#include "extensions/common/permissions/permissions_data.h"

#include "extensions/common/url_pattern.h"

#include "extensions/common/url_pattern_set.h"

@@ -428,9 +429,8 @@ bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {

}

extension->SetManifestData(keys::kContentScripts,

content_scripts_info.release());

- PermissionsData::SetInitialScriptableHosts(

- extension,

- ContentScriptsInfo::GetScriptableHosts(extension));

+ PermissionsParser::SetScriptableHosts(

+ extension, ContentScriptsInfo::GetScriptableHosts(extension));

return true;

}