Show alert failure for reloading unpacked extensions with bad manifest

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

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..583fba401002e7c332fe8ec539814dcc900e3fea 100644
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h
@@ -12,6 +12,9 @@
 #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"

[Devlin, 2014/06/24 22:21:12]

FYI, you wouldn't need this include if the observer is in its own file (but you
will once it moves to the main file).

+#include "chrome/browser/extensions/extension_error_reporter_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {
@@ -23,13 +26,16 @@ class WebUIDataSource;
 }
 
 class Profile;
+class ExtensionErrorReporter;
+class ExtensionErrorReporterObserver;

[Devlin, 2014/06/24 22:21:12]

You don't have to forward declare classes whose .h's you include.

 
 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,

[Devlin, 2014/06/24 22:21:12]

No reason to have this public.

+                             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&

[Devlin, 2014/06/24 22:21:12]

Remove dead code.

+  // 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