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

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

Issue 698623002: Split WarningService from ExtensionSystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: virtual -> override 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 02de3697d452efe120114a24d94245f5be2f74ba..02e6ac67e9593946aed5b64f035442a2c9d9043d 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -24,7 +24,6 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/extension_util.h"
-#include "chrome/browser/extensions/extension_warning_badge_service.h"
#include "chrome/browser/extensions/install_verifier.h"
#include "chrome/browser/extensions/navigation_observer.h"
#include "chrome/browser/extensions/shared_module_service.h"
@@ -55,8 +54,6 @@
#include "extensions/browser/quota_service.h"
#include "extensions/browser/runtime_data.h"
#include "extensions/browser/state_store.h"
-#include "extensions/browser/warning_service.h"
-#include "extensions/browser/warning_set.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_urls.h"
@@ -383,11 +380,6 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
// Make the chrome://extension-icon/ resource available.
content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
- warning_service_.reset(new WarningService(profile_));
- extension_warning_badge_service_.reset(
- new ExtensionWarningBadgeService(profile_));
- warning_service_->AddObserver(
- extension_warning_badge_service_.get());
error_console_.reset(new ErrorConsole(profile_));
quota_service_.reset(new QuotaService);
@@ -411,10 +403,6 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
}
void ExtensionSystemImpl::Shared::Shutdown() {
- if (warning_service_) {
- warning_service_->RemoveObserver(
- extension_warning_badge_service_.get());
- }
if (content_verifier_.get())
content_verifier_->Shutdown();
if (extension_service_)
@@ -461,10 +449,6 @@ EventRouter* ExtensionSystemImpl::Shared::event_router() {
return event_router_.get();
}
-WarningService* ExtensionSystemImpl::Shared::warning_service() {
- return warning_service_.get();
-}
-
Blacklist* ExtensionSystemImpl::Shared::blacklist() {
return blacklist_.get();
}
@@ -569,10 +553,6 @@ EventRouter* ExtensionSystemImpl::event_router() {
return shared_->event_router();
}
-WarningService* ExtensionSystemImpl::warning_service() {
- return shared_->warning_service();
-}
-
Blacklist* ExtensionSystemImpl::blacklist() {
return shared_->blacklist();
}
« no previous file with comments | « chrome/browser/extensions/extension_system_impl.h ('k') | chrome/browser/extensions/extension_warning_badge_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698