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 fee671e9a9b5b912bda26bc22dc3b46fa6dea2c4..fb25dab041279723c9fe624cdb88c6cef0dd1156 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.h
@@ -12,9 +12,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/public/pref_observer.h"
+#include "base/scoped_observer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
-#include "chrome/browser/extensions/extension_warning_set.h"
+#include "chrome/browser/extensions/extension_warning_service.h"
 #include "chrome/browser/extensions/requirements_checker.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/public/browser/navigation_controller.h"
@@ -64,7 +65,8 @@ class ExtensionSettingsHandler
       public content::WebContentsObserver,
       public ui::SelectFileDialog::Listener,
       public ExtensionUninstallDialog::Delegate,
-      public base::SupportsWeakPtr<ExtensionSettingsHandler>{
+      public extensions::ExtensionWarningService::Observer,
+      public base::SupportsWeakPtr<ExtensionSettingsHandler> {
  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
@@ -73,11 +75,11 @@ class ExtensionSettingsHandler
 
   // Extension Detail JSON Struct for page. |pages| is injected for unit
   // testing.
-  // Note: |warning_set| can be NULL in unit tests.
+  // Note: |warning_service| can be NULL in unit tests.
   base::DictionaryValue* CreateExtensionDetailValue(
       const extensions::Extension* extension,
       const std::vector<ExtensionPage>& pages,
-      const ExtensionWarningSet* warning_set);
+      const extensions::ExtensionWarningService* warning_service);
 
   void GetLocalizedValues(base::DictionaryValue* localized_strings);
 
@@ -118,6 +120,9 @@ class ExtensionSettingsHandler
   virtual void ExtensionUninstallAccepted() OVERRIDE;
   virtual void ExtensionUninstallCanceled() OVERRIDE;
 
+  // extensions::ExtensionWarningService::Observer implementation.
+  virtual void ExtensionWarningsChanged() OVERRIDE;
+
   // Helper method that reloads all unpacked extensions.
   void ReloadUnpackedExtensions();
 
@@ -236,6 +241,10 @@ class ExtensionSettingsHandler
   // one to abort.
   scoped_ptr<extensions::RequirementsChecker> requirements_checker_;
 
+  ScopedObserver<extensions::ExtensionWarningService,

[Evan Stade, 2012/11/14 21:50:15]

I did not even know this existed. That is cool.

+                 extensions::ExtensionWarningService::Observer>
+      warning_service_observer_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };