Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1403)

Unified Diff: chrome/browser/memory_details.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
Index: chrome/browser/memory_details.cc
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 851986cf128b7c7e177a8c0d210ca10f69b3fd39..b2d22fbb67c4f0c17a20b5cabb9d7f39bd899dc9 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -32,8 +32,7 @@
#endif
#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/extension_service.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/browser/process_manager.h"
#include "extensions/browser/process_map.h"
#include "extensions/browser/view_type_utils.h"
@@ -286,8 +285,8 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
#if defined(ENABLE_EXTENSIONS)
content::BrowserContext* context =
render_process_host->GetBrowserContext();
- ExtensionService* extension_service =
- extensions::ExtensionSystem::Get(context)->extension_service();
+ extensions::ExtensionRegistry* extension_registry =
+ extensions::ExtensionRegistry::Get(context);
extensions::ProcessMap* extension_process_map =
extensions::ProcessMap::Get(context);
is_extension = extension_process_map->Contains(
@@ -317,7 +316,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
for (std::set<std::string>::iterator iter = extension_ids.begin();
iter != extension_ids.end(); ++iter) {
const Extension* extension =
- extension_service->GetExtensionById(*iter, false);
+ extension_registry->enabled_extensions().GetByID(*iter);
if (extension && !extension->is_hosted_app()) {
process.renderer_type =
ProcessMemoryInformation::RENDERER_EXTENSION;
@@ -329,7 +328,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() {
#if defined(ENABLE_EXTENSIONS)
if (is_extension) {
const Extension* extension =
- extension_service->extensions()->GetByID(url.host());
+ extension_registry->enabled_extensions().GetByID(url.host());
if (extension) {
base::string16 title = base::UTF8ToUTF16(extension->name());
process.titles.push_back(title);
« no previous file with comments | « chrome/browser/media_galleries/media_galleries_preferences.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698