Merge 182274

chrome/browser/extensions/extension_install_prompt.h

Index: chrome/browser/extensions/extension_install_prompt.h
===================================================================
--- chrome/browser/extensions/extension_install_prompt.h	(revision 182814)
+++ chrome/browser/extensions/extension_install_prompt.h	(working copy)
@@ -56,7 +56,6 @@
     RE_ENABLE_PROMPT,
     PERMISSIONS_PROMPT,
     EXTERNAL_INSTALL_PROMPT,
-    POST_INSTALL_PERMISSIONS_PROMPT,
     NUM_PROMPT_TYPES
   };
 
@@ -82,7 +81,6 @@
     // Getters for UI element labels.
     string16 GetDialogTitle() const;
     string16 GetHeading() const;
-    int GetDialogButtons() const;
     string16 GetAcceptButtonLabel() const;
     bool HasAbortButtonLabel() const;
     string16 GetAbortButtonLabel() const;
@@ -282,13 +280,6 @@
                                   const extensions::Extension* extension,
                                   const IssueAdviceInfo& issue_advice);
 
-  // This is called by the app handler launcher to review what permissions the
-  // extension or app currently has.
-  //
-  // This *WILL* call Abort() on |delegate|.
-  virtual void ReviewPermissions(Delegate* delegate,
-                                 const extensions::Extension* extension);
-
   // Installation was successful. This is declared virtual for testing.
   virtual void OnInstallSuccess(const extensions::Extension* extension,
                                 SkBitmap* icon);