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

Unified Diff: chrome/browser/extensions/extension_warning_badge_service.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_warning_badge_service.cc
diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc
index 085cac9e0a98970cedf586cbce849f0c709b9fd2..7afb6fcb4b490090bf2f6ee4e516b074892a139d 100644
--- a/chrome/browser/extensions/extension_warning_badge_service.cc
+++ b/chrome/browser/extensions/extension_warning_badge_service.cc
@@ -6,13 +6,13 @@
#include "base/stl_util.h"
#include "chrome/app/chrome_command_ids.h"
+#include "chrome/browser/extensions/extension_warning_badge_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/global_error/global_error.h"
#include "chrome/browser/ui/global_error/global_error_service.h"
#include "chrome/browser/ui/global_error/global_error_service_factory.h"
#include "chrome/grit/generated_resources.h"
-#include "extensions/browser/extension_system.h"
#include "ui/base/l10n/l10n_util.h"
namespace extensions {
@@ -87,14 +87,20 @@ int ErrorBadge::GetMenuItemCommandID() {
} // namespace
-
ExtensionWarningBadgeService::ExtensionWarningBadgeService(Profile* profile)
- : profile_(profile) {
+ : profile_(profile), warning_service_observer_(this) {
DCHECK(CalledOnValidThread());
+ warning_service_observer_.Add(WarningService::Get(profile_));
}
ExtensionWarningBadgeService::~ExtensionWarningBadgeService() {}
+// static
+ExtensionWarningBadgeService* ExtensionWarningBadgeService::Get(
+ content::BrowserContext* context) {
+ return ExtensionWarningBadgeServiceFactory::GetForBrowserContext(context);
+}
+
void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
DCHECK(CalledOnValidThread());
size_t old_size = suppressed_warnings_.size();
@@ -107,7 +113,7 @@ void ExtensionWarningBadgeService::SuppressCurrentWarnings() {
}
const WarningSet& ExtensionWarningBadgeService::GetCurrentWarnings() const {
- return ExtensionSystem::Get(profile_)->warning_service()->warnings();
+ return WarningService::Get(profile_)->warnings();
}
void ExtensionWarningBadgeService::ExtensionWarningsChanged() {

Powered by Google App Engine
This is Rietveld 408576698