chrome/browser/extensions/api/messaging/message_service.cc - Issue 709813004: Remove the deprecated function ExtensionService::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: chrome/browser/extensions/api/messaging/message_service.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc ('k') | chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/messaging/message_service.cc

diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc

index 68fa08626c5da3eff0e0bf84a630f88e16f384fd..19f72f03c6689e5f94a1b0ac676f638abcfec99d 100644

--- a/chrome/browser/extensions/api/messaging/message_service.cc

+++ b/chrome/browser/extensions/api/messaging/message_service.cc

@@ -31,6 +31,7 @@

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

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

#include "extensions/browser/extension_host.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

#include "extensions/browser/extensions_browser_client.h"

#include "extensions/browser/lazy_background_task_queue.h"

@@ -244,10 +245,9 @@ void MessageService::OpenChannelToExtension(

return;

BrowserContext* context = source->GetBrowserContext();

- ExtensionSystem* extension_system = ExtensionSystem::Get(context);

- DCHECK(extension_system);

- const Extension* target_extension = extension_system->extension_service()->

- extensions()->GetByID(target_extension_id);

+ ExtensionRegistry* registry = ExtensionRegistry::Get(context);

+ const Extension* target_extension =

+ registry->enabled_extensions().GetByID(target_extension_id);

if (!target_extension) {

DispatchOnDisconnect(

source, receiver_port_id, kReceivingEndDoesntExistError);

@@ -724,9 +724,9 @@ void MessageService::GotChannelID(scoped_ptr<OpenChannelParams> params,

BrowserContext* context = params->source->GetBrowserContext();

+ ExtensionRegistry* registry = ExtensionRegistry::Get(context);

const Extension* target_extension =

- ExtensionSystem::Get(context)->extension_service()->extensions()->GetByID(

- params->target_extension_id);

+ registry->enabled_extensions().GetByID(params->target_extension_id);

if (!target_extension) {

pending_tls_channel_id_channels_.erase(channel_id);

DispatchOnDisconnect(