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..d35ecd873b7ad6cd1d9bf1c3f454e1e8803fc0b5 100644
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h
@@ -6,12 +6,16 @@
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_
 
 #include <string>
+#include <vector>

[Devlin, 2014/07/01 22:14:17]

Don't need this now, right?

[gpdavis, 2014/07/01 23:48:10]

I will when I add in a vector of file paths since they can't be sent with the
reload message ;)

 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.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 +33,8 @@ 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::Observer {
  public:
   explicit ExtensionLoaderHandler(Profile* profile);
   virtual ~ExtensionLoaderHandler();
@@ -43,17 +48,40 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler {
  private:
   class FileHelper;
 
+  // Struct to hold failure data when NotifyFrontendOfFailure is called before
+  // the extensions page is fully loaded.
+  struct FailureData {

[Devlin, 2014/07/01 22:14:17]

Can we actually move the definition to the .cc file and just forward-declare it
here?

[gpdavis, 2014/07/01 23:48:10]

Yessir we can.

+    FailureData(base::FilePath file_path,
+                std::string error,
+                size_t line_number,
+                std::string manifest);
+
+    ~FailureData() {}

[Devlin, 2014/07/01 22:14:17]

For a class with member data, we actually prefer the destructor to be
out-of-line, too.

[gpdavis, 2014/07/01 23:48:10]

So if these are out of line, do they still go outside the declaration in the cc
file?

struct FailureData {
  FailureData(...
              ...)
     : ...(...) {}
...
}

or

struct FailureData {
  FailureData(...
              ...)
...
}

FailureData::FailureData(...,
                         ...)
    : ...(...) {}

[Devlin, 2014/07/02 17:46:49]

The latter.

inline wrt classes basically means "declared and defined simultaneously in the
same piece of code."

+
+    base::FilePath file_path;
+    std::string error;
+    size_t line_number;
+    std::string manifest;
+  };
+
   // Handle the 'extensionLoaderLoadUnpacked' message.
   void HandleLoadUnpacked(const base::ListValue* args);
 
   // Handle the 'extensionLoaderRetry' message.
   void HandleRetry(const base::ListValue* args);
 
+  // Handle the 'extensionLoaderSetDisplayLoading' message.
+  void HandleSetDisplayLoading(const base::ListValue* args);
+
+  // Handle the 'extensionLoaderDisplayFailures' message.
+  void HandleDisplayFailures(const base::ListValue* args);
+
   // Try to load an unpacked extension from the given |file_path|.
   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);
+  // ExtensionErrorReporter::Observer implementation.
+  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
@@ -69,9 +97,14 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler {
   // A helper to manage file picking.
   scoped_ptr<FileHelper> file_helper_;
 
-  // The file path to the extension that failed to load, or empty. This is
-  // loaded when the user selects "retry".
-  base::FilePath failed_path_;
+  // Holds information about all unpacked extension install failures that
+  // were reported while the extensions page was loading.
+  ScopedVector<FailureData> failures_;
+
+  ScopedObserver<ExtensionErrorReporter, ExtensionErrorReporter::Observer>
+      extension_error_reporter_observer_;
+
+  bool display_ready_;
 
   // Weak pointer factory for posting background tasks.
   base::WeakPtrFactory<ExtensionLoaderHandler> weak_ptr_factory_;