Update extension install prompt to reflect withheld permissions

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 62 matching lines @@
     PERMISSIONS_PROMPT,
     EXTERNAL_INSTALL_PROMPT,
     POST_INSTALL_PERMISSIONS_PROMPT,
     LAUNCH_PROMPT,
     REMOTE_INSTALL_PROMPT,
     NUM_PROMPT_TYPES
   };
 
   enum DetailsType {
     PERMISSIONS_DETAILS = 0,
+    WITHHELD_PERMISSIONS_DETAILS,
     RETAINED_FILES_DETAILS,
   };
 
+  enum PermissionsType {
+    REGULAR_PERMISSIONS = 0,
+    WITHHELD_PERMISSIONS,
+    ALL_PERMISSIONS,
+  };
+
   static std::string PromptTypeToString(PromptType type);
 
   // 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.
   // Ref-counted because we pass around the prompt independent of the full
   // ExtensionInstallPrompt.
   class Prompt : public base::RefCountedThreadSafe<Prompt> {
    public:
     explicit Prompt(PromptType type);
 
     // Sets the permission list for this prompt.
-    void SetPermissions(const std::vector<base::string16>& permissions);
+    void SetPermissions(const std::vector<base::string16>& permissions,
+                        PermissionsType permissions_type);
     // Sets the permission list details for this prompt.
-    void SetPermissionsDetails(const std::vector<base::string16>& details);
+    void SetPermissionsDetails(const std::vector<base::string16>& details,
+                               PermissionsType permissions_type);
     void SetIsShowingDetails(DetailsType type,
                              size_t index,
                              bool is_showing_details);
     void SetWebstoreData(const std::string& localized_user_count,
                          bool show_user_count,
                          double average_rating,
                          int rating_count);
     void SetUserNameFromProfile(Profile* profile);
 
     PromptType type() const { return type_; }
     void set_type(PromptType type) { type_ = type; }
 
     // Getters for UI element labels.
     base::string16 GetDialogTitle() const;
     base::string16 GetHeading() const;
     int GetDialogButtons() const;
     bool HasAcceptButtonLabel() const;
     base::string16 GetAcceptButtonLabel() const;
     bool HasAbortButtonLabel() const;
     base::string16 GetAbortButtonLabel() const;
-    base::string16 GetPermissionsHeading() const;
+    base::string16 GetPermissionsHeading(
+        PermissionsType permissions_type) const;
     base::string16 GetRetainedFilesHeading() const;
 
     bool ShouldShowPermissions() const;
     bool ShouldShowExplanationText() 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
     // components.ratingutils.setFractionalYellowStars). Callers pass in an
     // "appender", which will be repeatedly called back with the star images
     // that they append to the star display area.
     typedef void(*StarAppender)(const gfx::ImageSkia*, void*);
     void AppendRatingStars(StarAppender appender, void* data) const;
     base::string16 GetRatingCount() const;
     base::string16 GetUserCount() const;
-    size_t GetPermissionCount() const;
-    size_t GetPermissionsDetailsCount() const;
-    base::string16 GetPermission(size_t index) const;
-    base::string16 GetPermissionsDetails(size_t index) const;
+    size_t GetPermissionCount(PermissionsType permissions_type) const;
+    size_t GetPermissionsDetailsCount(PermissionsType permissions_type) const;
+    base::string16 GetPermission(size_t index,
+                                 PermissionsType permissions_type) const;
+    base::string16 GetPermissionsDetails(
+        size_t index,
+        PermissionsType permissions_type) const;
     bool GetIsShowingDetails(DetailsType type, size_t index) const;
     size_t GetRetainedFileCount() const;
     base::string16 GetRetainedFile(size_t index) const;
 
     // Populated for BUNDLE_INSTALL_PROMPT.
     const extensions::BundleInstaller* bundle() const { return bundle_; }
     void set_bundle(const extensions::BundleInstaller* bundle) {
       bundle_ = bundle;
     }
 
@@ skipping 14 matching lines @@
     bool has_webstore_data() const { return has_webstore_data_; }
 
     const ExtensionInstallPromptExperiment* experiment() const {
       return experiment_.get();
     }
     void set_experiment(ExtensionInstallPromptExperiment* experiment) {
       experiment_ = experiment;
     }
 
    private:
+    struct PermissionsInfo {

[Devlin, 2014/09/04 22:06:08]

We already have a PermissionsInfo, so this may be confusing.  How about
InstallPromptPermissions?

[gpdavis, 2014/09/05 20:23:01]

Done.

+      PermissionsInfo();
+      ~PermissionsInfo();

[Devlin, 2014/09/04 22:06:08]

nit: newline between destructor and members.

[gpdavis, 2014/09/05 20:23:01]

Done.

+      std::vector<base::string16> permissions;
+      std::vector<base::string16> details;
+      std::vector<bool> is_showing_details;
+    };
+
     friend class base::RefCountedThreadSafe<Prompt>;

[Devlin, 2014/09/04 22:06:08]

nit: leave friend class above the struct.

[gpdavis, 2014/09/05 20:23:02]

Done.

 
     virtual ~Prompt();
 
     bool ShouldDisplayRevokeFilesButton() const;
 
     PromptType type_;
 
     // Permissions that are being requested (may not be all of an extension's
     // permissions if only additional ones are being requested)
-    std::vector<base::string16> permissions_;
-    std::vector<base::string16> details_;
-    std::vector<bool> is_showing_details_for_permissions_;
+    PermissionsInfo permissions_info_;
+    // Permissions that will be withheld upon install.
+    PermissionsInfo withheld_permissions_info_;
+
     bool is_showing_details_for_retained_files_;
 
     // The extension or bundle being installed.
     const extensions::Extension* extension_;
     const extensions::BundleInstaller* bundle_;
 
     // The icon to be displayed.
     gfx::Image icon_;
 
     // These fields are populated only when the prompt type is
@@ skipping 218 matching lines @@
   Delegate* delegate_;
 
   // A pre-filled prompt.
   scoped_refptr<Prompt> prompt_;
 
   // Used to show the confirm dialog.
   ShowDialogCallback show_dialog_callback_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_