chrome/renderer/extensions/extension_dispatcher.cc - Issue 9978012: Revert 130697 - Reland r130462: Implement FeatureProvider for ExtensionAPI."

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/renderer/extensions/extension_dispatcher.cc

Issue 9978012: Revert 130697 - Reland r130462: Implement FeatureProvider for ExtensionAPI." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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/common/extensions/simple_feature_provider_unittest.cc ('k') | chrome/renderer/extensions/schema_generated_bindings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/extension_dispatcher.cc

===================================================================

--- chrome/renderer/extensions/extension_dispatcher.cc (revision 130700)

+++ chrome/renderer/extensions/extension_dispatcher.cc (working copy)

@@ -576,7 +576,7 @@

// correct APIs, however, until it doesn't have a 2MB overhead we can't

// load it in every process.

scoped_ptr<std::set<std::string> > apis =

- ExtensionAPI::GetSharedInstance()->GetAPIsForContext(

+ ExtensionAPI::GetInstance()->GetAPIsForContext(

context_type, extension, url_info.url());

for (std::set<std::string>::iterator i = apis->begin(); i != apis->end();

++i) {

@@ -834,7 +834,7 @@

}

if (!IsExtensionActive(extension->id()) &&

- ExtensionAPI::GetSharedInstance()->IsPrivileged(function_name)) {

+ ExtensionAPI::GetInstance()->IsPrivileged(function_name)) {

static const char kMessage[] =

"%s can only be used in an extension process.";

std::string error_msg = base::StringPrintf(kMessage, function_name.c_str());