Improve UI for unpacked extensions failing to load

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/extension_warning_service.h"
 #include "chrome/browser/extensions/requirements_checker.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_observer.h"
-#include "ui/shell_dialogs/select_file_dialog.h"
 #include "url/gurl.h"
 
 class ExtensionService;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
 class ListValue;
 }
 
@@ skipping 22 matching lines @@
   int render_view_id;
   bool incognito;
   bool generated_background_page;
 };
 
 // Extension Settings UI handler.
 class ExtensionSettingsHandler
     : public content::WebUIMessageHandler,
       public content::NotificationObserver,
       public content::WebContentsObserver,
-      public ui::SelectFileDialog::Listener,
       public ErrorConsole::Observer,
       public ExtensionInstallPrompt::Delegate,
       public ExtensionPrefsObserver,
       public ExtensionUninstallDialog::Delegate,
       public ExtensionWarningService::Observer,
       public base::SupportsWeakPtr<ExtensionSettingsHandler> {
  public:
   ExtensionSettingsHandler();
   virtual ~ExtensionSettingsHandler();
 
@@ skipping 20 matching lines @@
       const GURL& url,
       content::NavigationController::ReloadType reload_type) OVERRIDE;
 
   // Allows injection for testing by friend classes.
   ExtensionSettingsHandler(ExtensionService* service,
                            ManagementPolicy* policy);
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
-  // Loads an unpacked extension from |path|.
-  void LoadUnpackedExtension(const base::FilePath& path);
-
-  // Returns the index of the given FilePath in the vector of currently loading
-  // extensions. Returns -1 if not found.
-  int IndexOfLoadingPath(const base::FilePath& path);
-
-  // Adds |path| to the vector of currently loading extensions. Registers
-  // for the load retry notification if vector is empty before call.
-  void AddLoadingPath(const base::FilePath& path);
-
-  // Removes |path| from the vector of currently loading extensions. Unregisters
-  // for the load retry notification if vector is empty after call.
-  void RemoveLoadingPath(const base::FilePath& path);
-
-  // SelectFileDialog::Listener implementation.
-  virtual void FileSelected(const base::FilePath& path,
-                            int index,
-                            void* params) OVERRIDE;
-  virtual void MultiFilesSelected(
-      const std::vector<base::FilePath>& files, void* params) OVERRIDE;
-  virtual void FileSelectionCanceled(void* params) OVERRIDE;
-
   // ErrorConsole::Observer implementation.
   virtual void OnErrorAdded(const ExtensionError* error) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ExtensionPrefsObserver implementation.
   virtual void OnExtensionDisableReasonsChanged(const std::string& extension_id,
@@ skipping 49 matching lines @@
 
   // Callback for "permissions" message.
   void HandlePermissionsMessage(const base::ListValue* args);
 
   // Callback for "showButton" message.
   void HandleShowButtonMessage(const base::ListValue* args);
 
   // Callback for "autoupdate" message.
   void HandleAutoUpdateMessage(const base::ListValue* args);
 
-  // Callback for "loadUnpackedExtension" message.
-  void HandleLoadUnpackedExtensionMessage(const base::ListValue* args);
-
   // Callback for the "dismissADTPromo" message.
   void HandleDismissADTPromoMessage(const base::ListValue* args);
 
   // Utility for calling JavaScript window.alert in the page.
   void ShowAlert(const std::string& message);
 
   // Utility for callbacks that get an extension ID as the sole argument.
   // Returns NULL if the extension isn't active.
   const Extension* GetActiveExtension(const base::ListValue* args);
 
@@ skipping 30 matching lines @@
   // Does nothing if |path| is not a currently loading extension this object is
   // tracking.
   void HandleLoadRetryMessage(bool retry, const base::FilePath& path);
 
   // Our model.  Outlives us since it's owned by our containing profile.
   ExtensionService* extension_service_;
 
   // A convenience member, filled once the extension_service_ is known.
   ManagementPolicy* management_policy_;
 
-  // Used to pick the directory when loading an extension.
-  scoped_refptr<ui::SelectFileDialog> load_extension_dialog_;
-
-  // Used to start the |load_extension_dialog_| in the last directory that was
-  // loaded.
-  base::FilePath last_unpacked_directory_;
-
-  // Used to keep track of FilePaths for all extensions in the process of
-  // loading for the purpose of retrying on load failure.
-  std::vector<base::FilePath> loading_extension_directories_;
-
   // Used to show confirmation UI for uninstalling extensions in incognito mode.
   scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
 
   // The id of the extension we are prompting the user about.
   std::string extension_id_prompting_;
 
   // If true, we will ignore notifications in ::Observe(). This is needed
   // to prevent reloading the page when we were the cause of the
   // notification.
   bool ignore_notifications_;
@@ skipping 40 matching lines @@
   // Whether we found any DISABLE_NOT_VERIFIED extensions and want to kick off
   // a verification check to try and rescue them.
   bool should_do_verification_check_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSettingsHandler);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_HANDLER_H_