Improve error messaging of webRequest API in case of conflicts

chrome/browser/ui/webui/extensions/extension_settings_handler.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_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/public/pref_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"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/dialogs/select_file_dialog.h"
@@ skipping 29 matching lines @@
 };
 
 // Extension Settings UI handler.
 class ExtensionSettingsHandler
     : public content::WebUIMessageHandler,
       public content::NotificationObserver,
       public PrefObserver,
       public content::WebContentsObserver,
       public ui::SelectFileDialog::Listener,
       public ExtensionUninstallDialog::Delegate,
+      public extensions::ExtensionWarningService::Observer,
       public base::SupportsWeakPtr<ExtensionSettingsHandler>{

[Evan Stade, 2012/11/13 20:21:54]

can you add a space before the curly

[battre, 2012/11/14 12:30:54]

Done.

  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // 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);
 
   // content::WebContentsObserver implementation, which reloads all unpacked
   // extensions whenever chrome://extensions is reloaded.
   virtual void NavigateToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) OVERRIDE;
 
  private:
@@ skipping 20 matching lines @@
 
   // PrefObserver implementation.
   virtual void OnPreferenceChanged(PrefServiceBase* service,
                                    const std::string& pref_name) OVERRIDE;
 
   // ExtensionUninstallDialog::Delegate implementation, used for receiving
   // notification about uninstall confirmation dialog selections.
   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();
 
   // Callback for "requestExtensionsData" message.
   void HandleRequestExtensionsData(const base::ListValue* args);
 
   // Callback for "toggleDeveloperMode" message.
   void HandleToggleDeveloperMode(const base::ListValue* args);
 
   // Callback for "inspect" message.
@@ skipping 102 matching lines @@
 
   // This will not be empty when a requirements check is in progress. Doing
   // another Check() before the previous one is complete will cause the first
   // one to abort.
   scoped_ptr<extensions::RequirementsChecker> requirements_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_