Improve error messaging of webRequest API in case of conflicts

chrome/browser/ui/webui/extensions/extension_settings_handler.h

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.h
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.h b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
index 1f80d25c89fa6aaa57bb9ea6744e39ac553b85a6..1cf110165bd1174d5e0cfddae0f74cbfb49e0d05 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
@@ -37,6 +37,7 @@ class ListValue;
 namespace extensions {
 class Extension;
 class ExtensionHost;
+class ExtensionWarningSet;
 class ManagementPolicy;
 }
 
@@ -62,7 +63,8 @@ class ExtensionSettingsHandler
       public content::WebContentsObserver,
       public ui::SelectFileDialog::Listener,
       public ExtensionUninstallDialog::Delegate,
-      public base::SupportsWeakPtr<ExtensionSettingsHandler>{
+      public extensions::ExtensionWarningSet::Observer,
+      public base::SupportsWeakPtr<ExtensionSettingsHandler> {
  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
@@ -75,7 +77,7 @@ class ExtensionSettingsHandler
   base::DictionaryValue* CreateExtensionDetailValue(
       const extensions::Extension* extension,
       const std::vector<ExtensionPage>& pages,
-      const ExtensionWarningSet* warning_set);
+      const extensions::ExtensionWarningSet* warning_set);
 
   void GetLocalizedValues(base::DictionaryValue* localized_strings);
 
@@ -112,6 +114,9 @@ class ExtensionSettingsHandler
   virtual void ExtensionUninstallAccepted() OVERRIDE;
   virtual void ExtensionUninstallCanceled() OVERRIDE;
 
+  // extensions::ExtensionWarningSet::Observer implementation.
+  virtual void ExtensionWarningsChanged() OVERRIDE;
+
   // Helper method that reloads all unpacked extensions.
   void ReloadUnpackedExtensions();