extensions/browser/api/declarative/declarative_api.cc - Issue 596003002: Allow declarative webrequest and webrequest in extensions.

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/api/declarative/declarative_api.cc

Issue 596003002: Allow declarative webrequest and webrequest in extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Clean up RuleRegistry in ExtensionsApiClient. Created 6 years, 3 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/renderer/resources/renderer_resources.grd ('k') | extensions/browser/api/declarative/rules_registry_service.cc » ('j') | extensions/browser/api/declarative/rules_registry_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/declarative/declarative_api.cc

diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc

index e9b355d950d2c9892ef69ee25e840b9ac56fcc4e..e97028bd4497757a0a3f8b42dfeb9874f0164e16 100644

--- a/extensions/browser/api/declarative/declarative_api.cc

+++ b/extensions/browser/api/declarative/declarative_api.cc

@@ -13,6 +13,7 @@

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

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

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

+#include "extensions/browser/api/declarative/rules_registry_service.h"

#include "extensions/browser/api/extensions_api_client.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/guest_view/web_view/web_view_constants.h"

@@ -153,8 +154,8 @@ bool RulesFunction::RunAsync() {

// The following call will return a NULL pointer for apps_shell, but should

// never be called there anyways.

- rules_registry_ = ExtensionsAPIClient::Get()->GetRulesRegistry(

- browser_context(), key, event_name);

+ rules_registry_ = RulesRegistryService::Get(browser_context())->

+ GetRulesRegistry(key, event_name);

DCHECK(rules_registry_.get());

// Raw access to this function is not available to extensions, therefore

// there should never be a request for a nonexisting rules registry.