chrome/browser/ui/webui/extensions/extension_icon_source.cc - Issue 11365181: Remove GetExtensionService from Profile.

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_icon_source.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: response to sky Created 8 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:

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

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

index 78f360dd60a0618afe330f7d4403de5cc26c068d..139971dbeaaa44f3ff4a838c8b70d3947111f3fb 100644

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

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

@@ -15,6 +15,7 @@

#include "base/threading/thread.h"

#include "chrome/browser/extensions/extension_prefs.h"

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

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/image_loader.h"

#include "chrome/browser/favicon/favicon_service_factory.h"

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

@@ -292,7 +293,8 @@ bool ExtensionIconSource::ParseData(const std::string& path,

std::string extension_id = path_parts.at(0);

const extensions::Extension* extension =

- profile_->GetExtensionService()->GetInstalledExtension(extension_id);

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

+ GetInstalledExtension(extension_id);

if (!extension)

return false;