chrome/browser/ui/app_list/extension_uninstaller.cc - Issue 1130353010: Remove deprecated ExtensionService::GetInstalledExtension() usage

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/ui/app_list/extension_uninstaller.cc

Issue 1130353010: Remove deprecated ExtensionService::GetInstalledExtension() usage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changed if to iff Created 5 years, 6 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/browser/ui/app_list/extension_app_model_builder_unittest.cc ('k') | chrome/browser/ui/app_list/search/app_result.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/extension_uninstaller.cc

diff --git a/chrome/browser/ui/app_list/extension_uninstaller.cc b/chrome/browser/ui/app_list/extension_uninstaller.cc

index 7927afa60e0a8f2a9c79791f87170dc268258f05..d6371c73a0f7a0c9b72ab87f919b3fcdc78a3dbe 100644

--- a/chrome/browser/ui/app_list/extension_uninstaller.cc

+++ b/chrome/browser/ui/app_list/extension_uninstaller.cc

@@ -4,10 +4,9 @@

#include "chrome/browser/ui/app_list/extension_uninstaller.h"

-#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"

-#include "extensions/browser/extension_system.h"

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

#include "extensions/browser/uninstall_reason.h"

#include "extensions/common/extension.h"

@@ -25,8 +24,8 @@ ExtensionUninstaller::~ExtensionUninstaller() {

void ExtensionUninstaller::Run() {

const extensions::Extension* extension =

- extensions::ExtensionSystem::Get(profile_)->extension_service()->

- GetInstalledExtension(app_id_);

+ extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension(

+ app_id_);

if (!extension) {

CleanUp();

return;