Merge 182274

chrome/browser/extensions/extension_install_prompt.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_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 38 matching lines @@
       public base::SupportsWeakPtr<ExtensionInstallPrompt> {
  public:
   enum PromptType {
     UNSET_PROMPT_TYPE = -1,
     INSTALL_PROMPT = 0,
     INLINE_INSTALL_PROMPT,
     BUNDLE_INSTALL_PROMPT,
     RE_ENABLE_PROMPT,
     PERMISSIONS_PROMPT,
     EXTERNAL_INSTALL_PROMPT,
-    POST_INSTALL_PERMISSIONS_PROMPT,
     NUM_PROMPT_TYPES
   };
 
   // Extra information needed to display an installation or uninstallation
   // prompt. Gets populated with raw data and exposes getters for formatted
   // strings so that the GTK/views/Cocoa install dialogs don't have to repeat
   // that logic.
   class Prompt {
    public:
     explicit Prompt(PromptType type);
     ~Prompt();
 
     void SetPermissions(const std::vector<string16>& permissions);
     void SetInlineInstallWebstoreData(const std::string& localized_user_count,
                                       double average_rating,
                                       int rating_count);
     void SetOAuthIssueAdvice(const IssueAdviceInfo& issue_advice);
     void SetUserNameFromProfile(Profile* profile);
 
     PromptType type() const { return type_; }
     void set_type(PromptType type) { type_ = type; }
 
     // Getters for UI element labels.
     string16 GetDialogTitle() const;
     string16 GetHeading() const;
-    int GetDialogButtons() const;
     string16 GetAcceptButtonLabel() const;
     bool HasAbortButtonLabel() const;
     string16 GetAbortButtonLabel() const;
     string16 GetPermissionsHeading() const;
     string16 GetOAuthHeading() const;
 
     // Getters for webstore metadata. Only populated when the type is
     // INLINE_INSTALL_PROMPT.
 
     // The star display logic replicates the one used by the webstore (from
@@ skipping 179 matching lines @@
                                   const extensions::PermissionSet* permissions);
 
   // This is called by the extension identity API to verify whether an
   // extension can be granted an OAuth2 token.
   //
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmIssueAdvice(Delegate* delegate,
                                   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);
 
   // Installation failed. This is declared virtual for testing.
   virtual void OnInstallFailure(const extensions::CrxInstallerError& error);
 
  protected:
   friend class extensions::ExtensionWebstorePrivateApiTest;
   friend class extensions::MockGetAuthTokenFunction;
@@ skipping 56 matching lines @@
   // A pre-filled prompt.
   Prompt prompt_;
 
   scoped_ptr<OAuth2MintTokenFlow> token_flow_;
 
   // Used to show the confirm dialog.
   ShowDialogCallback show_dialog_callback_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_