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

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

Issue 10407105: Improve error messaging of webRequest API in case of conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Store ExtensionWarnings as values in set rather than pointers Created 8 years, 3 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_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 78d62775227981b202f61c23de51d3d50715fb9e..98f0b1d7f82cf8464d17179d7e76c0d710bcab67 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/extensions/extension_process_manager.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system_factory.h"
+#include "chrome/browser/extensions/extension_warning_set.h"
#include "chrome/browser/extensions/lazy_background_task_queue.h"
#include "chrome/browser/extensions/management_policy.h"
#include "chrome/browser/extensions/api/messaging/message_service.h"
@@ -293,6 +294,8 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
rules_registry_service_.reset(new RulesRegistryService(profile_));
rules_registry_service_->RegisterDefaultRulesRegistries();
+ extension_warning_service_.reset(new ExtensionWarningService(profile_));
+
shared_->Init(extensions_enabled);
}
@@ -375,6 +378,10 @@ ExtensionSystemImpl::usb_device_resource_manager() {
return usb_device_resource_manager_.get();
}
+ExtensionWarningService* ExtensionSystemImpl::warning_service() {
+ return extension_warning_service_.get();
+}
+
void ExtensionSystemImpl::RegisterExtensionWithRequestContexts(
const Extension* extension) {
base::Time install_time;

Powered by Google App Engine
This is Rietveld 408576698