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

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: origins 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

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/extensions/extension_chrome_auth_private_api.cc ('k') | chrome/browser/extensions/extension_navigation_observer.cc » ('j') | chrome/browser/extensions/extension_service.cc » ('J')
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 c5891bee75754587e7bf3768d5e66b74ff4b4689..bcdc386e959d887ae7155b917209ccd77ef5c130 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 -------------------------------------------------------------

@@ -610,7 +613,9 @@ void ExtensionFunctionDispatcher::Dispatch(

const Extension* extension = service->GetExtensionById(

params.extension_id, false);

if (!extension)

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

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

+ WebSecurityOrigin::createFromString(params.origin),

Aaron Boodman 2011/12/09 16:05:20 Does this do the right thing with unique origins?

Yoyo Zhou 2011/12/09 19:59:09 I assume so because Adam wrote earlier that "Using

+ params.source_url));

scoped_refptr<ExtensionFunction> function(

CreateExtensionFunction(params, extension,