Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3502)

Unified Diff: chrome/browser/ui/webui/extensions/extension_loader_handler.h

Issue 342003005: Show alert failure for reloading unpacked extensions with bad manifest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments and user facing text Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..532ab396f4621a4563eaff3a84888e42a8d1465d 100644
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.h
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.h
@@ -6,18 +6,20 @@
#define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_LOADER_HANDLER_H_
#include <string>
+#include <vector>
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
+#include "base/values.h"
+#include "chrome/browser/extensions/extension_error_reporter.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_ui_message_handler.h"
-namespace base {
-class ListValue;
-}
-
namespace content {
class WebUIDataSource;
}
@@ -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::Observer,
+ public content::WebContentsObserver {
public:
explicit ExtensionLoaderHandler(Profile* profile);
virtual ~ExtensionLoaderHandler();
@@ -49,19 +53,34 @@ class ExtensionLoaderHandler : public content::WebUIMessageHandler {
// Handle the 'extensionLoaderRetry' message.
void HandleRetry(const base::ListValue* args);
+ // Handle the 'extensionLoaderIgnoreFailure' message.
+ void HandleIgnoreFailure(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:
+ virtual void OnLoadFailure(const base::FilePath& file_path,
+ const std::string& error) OVERRIDE;
+
+ // content::WebContentsObserver:
+ virtual void DidStartNavigationToPendingEntry(
+ const GURL& url,
+ content::NavigationController::ReloadType reload_type) 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
- // at which the error was found.
- void NotifyFrontendOfFailure(const base::FilePath& file_path,
- const std::string& error,
- size_t line_number,
- const std::string& manifest);
+ // Add a failure to failures_. If it was a manifest error, |manifest| will
Devlin 2014/07/16 20:25:10 nit: |failures_|
gpdavis 2014/07/16 20:43:28 Done.
+ // hold the manifest contents, and |line_number| will point to the line at
+ // which the error was found.
+ void AddFailure(const base::FilePath& file_path,
+ const std::string& error,
+ size_t line_number,
+ const std::string& manifest);
+
+ // Notify the frontend of all failures.
+ void NotifyFrontendOfFailure();
// The profile with which this Handler is associated.
Profile* profile_;
@@ -69,9 +88,20 @@ 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.
+ base::ListValue failures_;
+
+ // Holds failed paths for load retries.
+ std::vector<base::FilePath> failed_paths_;
+
+ ScopedObserver<ExtensionErrorReporter, ExtensionErrorReporter::Observer>
+ extension_error_reporter_observer_;
+
+ // Set when the chrome://extensions page is fully loaded and the frontend
Devlin 2014/07/16 20:25:10 nit: frontend *is* ready
gpdavis 2014/07/16 20:43:28 Done.
+ // ready to receive failures notifications. The page fails to display
Devlin 2014/07/16 20:25:10 nit: failure notifications, I think sounds better.
gpdavis 2014/07/16 20:43:28 Done.
+ // failures if they are sent before the Javascript is loaded.
+ bool ui_ready_;
// Weak pointer factory for posting background tasks.
base::WeakPtrFactory<ExtensionLoaderHandler> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698