Improve error messaging of webRequest API in case of conflicts

chrome/browser/extensions/extension_system.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 12 matching lines @@
 class Profile;
 
 namespace extensions {
 // Unfortunately, for the ApiResourceManager<> template classes, we don't seem
 // to be able to forward-declare because of compilation errors on Windows.
 class AlarmManager;
 class EventRouter;
 class Extension;
 class ExtensionPrefs;
 class ExtensionSystemSharedFactory;
+class ExtensionWarningBadgeService;
+class ExtensionWarningService;
 class LazyBackgroundTaskQueue;
 class ManagementPolicy;
 class MessageService;
 class NavigationObserver;
 class RulesRegistryService;
 class ShellWindowGeometryCache;
 class StateStore;
 class UserScriptMaster;
 
 // The ExtensionSystem manages the creation and destruction of services
@@ skipping 66 matching lines @@
   serial_connection_manager() = 0;
 
   // The Socket ResourceManager is created at startup.
   virtual ApiResourceManager<Socket>*
   socket_manager() = 0;
 
   // The UsbDeviceResource ResourceManager is created at startup.
   virtual ApiResourceManager<UsbDeviceResource>*
   usb_device_resource_manager() = 0;
 
+  // The ExtensionWarningService is created at startup.
+  virtual ExtensionWarningService* warning_service() = 0;
+
   // Called by the ExtensionService that lives in this system. Gives the
   // info map a chance to react to the load event before the EXTENSION_LOADED
   // notification has fired. The purpose for handling this event first is to
   // avoid race conditions by making sure URLRequestContexts learn about new
   // extensions before anything else needs them to know.
   virtual void RegisterExtensionWithRequestContexts(
       const Extension* extension) {}
 
   // Called by the ExtensionService that lives in this system. Lets the
   // info map clean up its RequestContexts once all the listeners to the
@@ skipping 32 matching lines @@
   virtual ExtensionInfoMap* info_map() OVERRIDE;  // shared
   virtual MessageService* message_service() OVERRIDE;  // shared
   virtual EventRouter* event_router() OVERRIDE;  // shared
   virtual RulesRegistryService* rules_registry_service()
       OVERRIDE;  // shared
   virtual ApiResourceManager<SerialConnection>* serial_connection_manager()
       OVERRIDE;
   virtual ApiResourceManager<Socket>* socket_manager() OVERRIDE;
   virtual ApiResourceManager<UsbDeviceResource>* usb_device_resource_manager()
       OVERRIDE;
+  virtual ExtensionWarningService* warning_service() OVERRIDE;
 
   virtual void RegisterExtensionWithRequestContexts(
       const Extension* extension) OVERRIDE;
 
   virtual void UnregisterExtensionWithRequestContexts(
       const std::string& extension_id,
       const extension_misc::UnloadedExtensionReason reason) OVERRIDE;
 
  private:
   friend class ExtensionSystemSharedFactory;
@@ skipping 57 matching lines @@
   // incoming resource requests from extension processes and those require
   // access to the ResourceContext owned by |io_data_|.
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
   scoped_ptr<AlarmManager> alarm_manager_;
   scoped_ptr<ApiResourceManager<SerialConnection> > serial_connection_manager_;
   scoped_ptr<ApiResourceManager<Socket> > socket_manager_;
   scoped_ptr<ApiResourceManager<
                UsbDeviceResource> > usb_device_resource_manager_;
   scoped_ptr<RulesRegistryService> rules_registry_service_;
 
+  scoped_ptr<ExtensionWarningService> extension_warning_service_;
+  scoped_ptr<ExtensionWarningBadgeService> extension_warning_badge_service_;
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_