chrome/browser/extensions/extension_function_dispatcher.cc - Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

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

Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: id Created 9 years 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_chrome_auth_private_api.cc ('k') | chrome/browser/extensions/extension_info_map_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_function_dispatcher.cc

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

index 780549668394f8010a6890c6957b8acc0a074549..ade3c4aab721b825741016442aadc925e7f9dd31 100644

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

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

@@ -65,11 +65,13 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/common/extensions/api/extension_api.h"

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

+#include "chrome/common/extensions/extension_set.h"

#include "chrome/common/url_constants.h"

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

#include "ipc/ipc_message.h"

#include "ipc/ipc_message_macros.h"

#include "third_party/skia/include/core/SkBitmap.h"

+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"

#if defined(TOOLKIT_VIEWS)

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

@@ -88,6 +90,7 @@

#endif

using extensions::ExtensionAPI;

+using WebKit::WebSecurityOrigin;

// FactoryRegistry -------------------------------------------------------------

@@ -608,10 +611,12 @@ void ExtensionFunctionDispatcher::Dispatch(

if (!service || !process_map)

return;

- const Extension* extension = service->GetExtensionById(

- params.extension_id, false);

+ const Extension* extension = service->extensions()->GetByID(

+ params.extension_id);

if (!extension)

- extension = service->GetExtensionByWebExtent(params.source_url);

+ extension = service->extensions()->GetHostedAppByURL(ExtensionURLInfo(

+ WebSecurityOrigin::createFromString(params.source_origin),

+ params.source_url));

scoped_refptr<ExtensionFunction> function(

CreateExtensionFunction(params, extension,