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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 139943005: Convert extensions::ProcessMap to BrowserContextKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase process_map Created 6 years, 11 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index bd076a926f243e95105e8fad03b4b149f0d3cbe2..b9c734071674fc1a52e7e0df6d7d737803cc8c26 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -82,6 +82,7 @@
#include "extensions/browser/pending_extension_manager.h"
#include "extensions/browser/pref_names.h"
#include "extensions/browser/process_manager.h"
+#include "extensions/browser/process_map.h"
#include "extensions/browser/update_observer.h"
#include "extensions/common/constants.h"
#include "extensions/common/error_utils.h"
@@ -2557,11 +2558,13 @@ void ExtensionService::Observe(int type,
if (!profile_->IsSameProfile(host_profile->GetOriginalProfile()))
break;
- if (process_map_.Contains(process->GetID())) {
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(profile_);
+ if (process_map->Contains(process->GetID())) {
// An extension process was terminated, this might have resulted in an
// app or extension becoming idle.
std::set<std::string> extension_ids =
- process_map_.GetExtensionsInProcess(process->GetID());
+ process_map->GetExtensionsInProcess(process->GetID());
for (std::set<std::string>::const_iterator it = extension_ids.begin();
it != extension_ids.end(); ++it) {
if (delayed_installs_.Contains(*it)) {
@@ -2574,7 +2577,7 @@ void ExtensionService::Observe(int type,
}
}
- process_map_.RemoveAllFromProcess(process->GetID());
+ process_map->RemoveAllFromProcess(process->GetID());
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/extensions/isolated_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698