Index: chrome/browser/ui/webui/extensions/extension_loader_handler.h |
diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.h b/chrome/browser/ui/webui/extensions/extension_loader_handler.h |
index 5d0351f97a0bfb200b2b64473ed49437a482393f..b335e6cfc9d97dcadbb76b34eea3403fea1c350e 100644 |
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h |
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h |
@@ -12,6 +12,8 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/scoped_observer.h" |
+#include "chrome/browser/extensions/extension_error_reporter.h" |
#include "content/public/browser/web_ui_message_handler.h" |
namespace base { |
@@ -29,7 +31,9 @@ namespace extensions { |
class Extension; |
// The handler page for the Extension Commands UI overlay. |
-class ExtensionLoaderHandler : public content::WebUIMessageHandler { |
+class ExtensionLoaderHandler : public content::WebUIMessageHandler, |
+ public ExtensionErrorReporter:: |
+ ExtensionErrorReporterObserver { |
public: |
explicit ExtensionLoaderHandler(Profile* profile); |
virtual ~ExtensionLoaderHandler(); |
@@ -53,7 +57,10 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler { |
void LoadUnpackedExtensionImpl(const base::FilePath& file_path); |
// Called when an unpacked extension fails to load. |
- void OnLoadFailure(const base::FilePath& file_path, const std::string& error); |
+ // void OnLoadFailure(const base::FilePath& file_path, const std::string& |
Devlin
2014/06/25 19:49:36
still have dead code here.
|
+ // error); |
+ virtual void OnLoadFailure(const base::FilePath& file_path, |
+ const std::string& error) OVERRIDE; |
// Notify the frontend of the failure. If it was a manifest error, |manifest| |
// will hold the manifest contents, and |line_number| will point to the line |
@@ -77,6 +84,9 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler { |
base::WeakPtrFactory<ExtensionLoaderHandler> weak_ptr_factory_; |
DISALLOW_COPY_AND_ASSIGN(ExtensionLoaderHandler); |
+ |
+ ScopedObserver<ExtensionErrorReporter, ExtensionErrorReporterObserver> |
+ extension_error_reporter_observer_; |
}; |
} // namespace extensions |