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

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

Issue 698553002: Split Blacklist from ExtensionSystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. 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/extensions/extension_system_impl.cc
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 02e6ac67e9593946aed5b64f035442a2c9d9043d..d0a3be36c65eb2b4d078285c2d5bb1ee9fcdb36d 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -15,7 +15,6 @@
#include "base/strings/string_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/extensions/blacklist.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/declarative_user_script_master.h"
#include "chrome/browser/extensions/error_console/error_console.h"
@@ -118,8 +117,6 @@ void ExtensionSystemImpl::Shared::InitPrefs() {
profile_->GetPath().AppendASCII(extensions::kRulesStoreName),
false));
- blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_)));
-
#if defined(OS_CHROMEOS)
const user_manager::User* user =
user_manager::UserManager::Get()->GetActiveUser();
@@ -319,7 +316,7 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
CommandLine::ForCurrentProcess(),
profile_->GetPath().AppendASCII(extensions::kInstallDirectoryName),
ExtensionPrefs::Get(profile_),
- blacklist_.get(),
+ Blacklist::Get(profile_),
autoupdate_enabled,
extensions_enabled,
&ready_));
@@ -449,10 +446,6 @@ EventRouter* ExtensionSystemImpl::Shared::event_router() {
return event_router_.get();
}
-Blacklist* ExtensionSystemImpl::Shared::blacklist() {
- return blacklist_.get();
-}
-
ErrorConsole* ExtensionSystemImpl::Shared::error_console() {
return error_console_.get();
}
@@ -553,10 +546,6 @@ EventRouter* ExtensionSystemImpl::event_router() {
return shared_->event_router();
}
-Blacklist* ExtensionSystemImpl::blacklist() {
- return shared_->blacklist();
-}
-
const OneShotEvent& ExtensionSystemImpl::ready() const {
return shared_->ready();
}
« no previous file with comments | « chrome/browser/extensions/extension_system_impl.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698