chrome/browser/memory_details.cc - Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet.

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/memory_details.cc

Issue 8827013: Move/replace/rename URL-based extension getters from ExtensionService to/in ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: :memory Created 9 years 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/extension_navigation_observer.cc ('K') | « chrome/browser/geolocation/chrome_geolocation_permission_context.cc ('k') | chrome/browser/notifications/desktop_notification_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/memory_details.cc

diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc

index c06ed53ede94dc111ce5231eb72cb4ea5192f4b3..7f7b84ff7437e00e1736644f9ba8aa6f6092b72f 100644

--- a/chrome/browser/memory_details.cc

+++ b/chrome/browser/memory_details.cc

@@ -232,11 +232,14 @@ void MemoryDetails::CollectChildInfoOnUIThread() {

TabContents* contents = host_delegate->GetAsTabContents();

if (!contents) {

if (extension_process_map->Contains(host->process()->GetID())) {

- const Extension* extension =

- extension_service->GetExtensionByURL(url);

- if (extension) {

- string16 title = UTF8ToUTF16(extension->name());

- process.titles.push_back(title);

+ if (url.SchemeIs(chrome::kExtensionScheme)) {

+ const Extension* extension =

+ extension_service->extensions()->

+ GetByURL(ExtensionURLInfo(url));

+ if (extension) {

+ string16 title = UTF8ToUTF16(extension->name());

+ process.titles.push_back(title);

+ }

}

} else if (process.renderer_type ==

ProcessMemoryInformation::RENDERER_UNKNOWN) {