Merge 182274

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

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.h
===================================================================
--- chrome/browser/ui/webui/extensions/extension_settings_handler.h	(revision 182814)
+++ chrome/browser/ui/webui/extensions/extension_settings_handler.h	(working copy)
@@ -12,7 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/scoped_observer.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"
@@ -67,7 +66,6 @@
       public content::NotificationObserver,
       public content::WebContentsObserver,
       public ui::SelectFileDialog::Listener,
-      public ExtensionInstallPrompt::Delegate,
       public ExtensionUninstallDialog::Delegate,
       public extensions::ExtensionWarningService::Observer,
       public base::SupportsWeakPtr<ExtensionSettingsHandler> {
@@ -123,10 +121,6 @@
   // extensions::ExtensionWarningService::Observer implementation.
   virtual void ExtensionWarningsChanged() OVERRIDE;
 
-  // ExtensionInstallPrompt::Delegate implementation.
-  virtual void InstallUIProceed() OVERRIDE;
-  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
-
   // Helper method that reloads all unpacked extensions.
   void ReloadUnpackedExtensions();
 
@@ -163,9 +157,6 @@
   // Callback for "options" message.
   void HandleOptionsMessage(const base::ListValue* args);
 
-  // Callback for "permissions" message.
-  void HandlePermissionsMessage(const base::ListValue* args);
-
   // Callback for "showButton" message.
   void HandleShowButtonMessage(const base::ListValue* args);
 
@@ -254,9 +245,6 @@
   // one to abort.
   scoped_ptr<extensions::RequirementsChecker> requirements_checker_;
 
-  // The UI for showing what permissions the extension has.
-  scoped_ptr<ExtensionInstallPrompt> prompt_;
-
   ScopedObserver<extensions::ExtensionWarningService,
                  extensions::ExtensionWarningService::Observer>
       warning_service_observer_;