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

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

Issue 195813007: Remove ExtensionService::IsExternalExtensionUninstalled() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 6 years, 9 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/pending_extension_manager.cc
diff --git a/chrome/browser/extensions/pending_extension_manager.cc b/chrome/browser/extensions/pending_extension_manager.cc
index 425143b2626153948b883a9207eee41d26ac8be8..1a4ed427781fbd75a4290f4bc326b505346666e6 100644
--- a/chrome/browser/extensions/pending_extension_manager.cc
+++ b/chrome/browser/extensions/pending_extension_manager.cc
@@ -10,6 +10,7 @@
#include "base/version.h"
#include "chrome/browser/extensions/extension_service.h"
#include "content/public/browser/browser_thread.h"
+#include "extensions/browser/extension_prefs.h"
#include "extensions/common/extension.h"
#include "url/gurl.h"
@@ -31,9 +32,9 @@ std::string GetVersionString(const Version& version) {
namespace extensions {
PendingExtensionManager::PendingExtensionManager(
- const ExtensionServiceInterface& service)
- : service_(service) {
-}
+ const ExtensionServiceInterface& service,
+ content::BrowserContext* context)
+ : service_(service), context_(context) {}
PendingExtensionManager::~PendingExtensionManager() {}
@@ -168,7 +169,7 @@ bool PendingExtensionManager::AddFromExternalUpdateUrl(
// If the new location has higher priority than the location of an existing
// extension, let the update process overwrite the existing extension.
} else {
- if (service_.IsExternalExtensionUninstalled(id))
+ if (ExtensionPrefs::Get(context_)->IsExternalExtensionUninstalled(id))
return false;
if (extension) {
« no previous file with comments | « chrome/browser/extensions/pending_extension_manager.h ('k') | chrome/browser/extensions/test_extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698