chrome/browser/ui/webui/extensions/extension_info_ui.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/ui/webui/extensions/extension_info_ui.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/ui/views/location_bar/origin_chip_view.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/extensions/extension_info_ui.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc

index 439d3f61a0bb0c54231cfae86b1c4b1a50dd579e..5e1080f5eda57a0b5d72e29a723e96f6b8a0f417 100644

--- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc

+++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc

@@ -8,7 +8,6 @@

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "base/time/time.h"

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

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

#include "chrome/browser/ui/webui/extensions/extension_basic_info.h"

#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"

@@ -18,7 +17,7 @@

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

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

#include "extensions/browser/extension_prefs.h"

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

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

#include "extensions/common/extension.h"

#include "extensions/common/extension_icon_set.h"

#include "grit/browser_resources.h"

@@ -57,10 +56,9 @@ GURL ExtensionInfoUI::GetURL(const std::string& extension_id) {

void ExtensionInfoUI::AddExtensionDataToSource(

const std::string& extension_id) {

Profile* profile = Profile::FromWebUI(web_ui());

- ExtensionService* extension_service =

- ExtensionSystem::Get(profile)->extension_service();

const Extension* extension =

- extension_service->extensions()->GetByID(extension_id);

+ ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(

+ extension_id);

if (!extension)

return;