chrome/browser/extensions/crx_installer.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/crx_installer.cc

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

Patch Set: 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

« chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc ('K') | « chrome/browser/extensions/component_loader_unittest.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | chrome/browser/extensions/extension_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/crx_installer.cc

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

index e269ead5f0ead39ee677998844b8c92f1e4c6735..788567e97933afcdfb806a66d5dd9ce025130a38 100644

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

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

@@ -39,6 +39,7 @@

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

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

#include "extensions/browser/extension_prefs.h"

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

#include "extensions/browser/extension_system.h"

#include "extensions/browser/install/crx_installer_error.h"

#include "extensions/browser/install/extension_install_ui.h"

@@ -597,8 +598,9 @@ void CrxInstaller::ConfirmInstall() {

CheckUpdateFromSettingsPage();

GURL overlapping_url;

+ ExtensionRegistry* registry = ExtensionRegistry::Get(service->profile());

const Extension* overlapping_extension =

- service->extensions()->GetHostedAppByOverlappingWebExtent(

+ registry->enabled_extensions().GetHostedAppByOverlappingWebExtent(

extension()->web_extent());

if (overlapping_extension &&

overlapping_extension->id() != extension()->id()) {