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..4dab3f7ceea62da67bb73d1de86f608d1efda2fe 100644 |
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h |
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h |
@@ -12,7 +12,10 @@ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/scoped_observer.h" |
#include "content/public/browser/web_ui_message_handler.h" |
+#include "chrome/browser/extensions/extension_error_reporter.h" |
+#include "chrome/browser/extensions/extension_error_reporter_observer.h" |
namespace base { |
class ListValue; |
@@ -23,13 +26,16 @@ class WebUIDataSource; |
} |
class Profile; |
+class ExtensionErrorReporter; |
+class ExtensionErrorReporterObserver; |
namespace extensions { |
class Extension; |
// The handler page for the Extension Commands UI overlay. |
-class ExtensionLoaderHandler : public content::WebUIMessageHandler { |
+class ExtensionLoaderHandler : public content::WebUIMessageHandler, |
+ public ExtensionErrorReporterObserver { |
public: |
explicit ExtensionLoaderHandler(Profile* profile); |
virtual ~ExtensionLoaderHandler(); |
@@ -40,6 +46,9 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler { |
// WebUIMessageHandler implementation. |
virtual void RegisterMessages() OVERRIDE; |
+ virtual void OnLoadFailure(const base::FilePath& file_path, |
+ const std::string& error) OVERRIDE; |
+ |
private: |
class FileHelper; |
@@ -53,7 +62,8 @@ 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& |
+ // error); |
// 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 +87,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 |