Commit 40498960 authored by Devlin Cronin's avatar Devlin Cronin Committed by Commit Bot

[Extensions] Cleanup ExtensionInstallPrompt a bit

A bit of cleanup:
- Remove unused / duplicate includes
- Remove unused enum
- Remove unused methods
- Remove unnecessary friending of RefCountedThreadSafe<>
- Remove unused data members

Bug: None

Change-Id: I2fb0cecfdd93cfca76177ae391566e3e278f1622
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2079526Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745657}
parent 44bc8648
......@@ -15,7 +15,6 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/extensions/extension_install_ui_factory.h"
#include "chrome/grit/generated_resources.h"
......@@ -32,15 +31,10 @@
#include "extensions/common/extension_features.h"
#include "extensions/common/extension_icon_set.h"
#include "extensions/common/extension_resource.h"
#include "extensions/common/feature_switch.h"
#include "extensions/common/manifest.h"
#include "extensions/common/manifest_constants.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "extensions/common/manifest_handlers/permissions_parser.h"
#include "extensions/common/permissions/permission_message.h"
#include "extensions/common/permissions/permission_message_provider.h"
#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_data.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_types.h"
......@@ -79,8 +73,6 @@ ExtensionInstallPrompt::g_last_prompt_type_for_tests =
ExtensionInstallPrompt::Prompt::Prompt(PromptType type)
: type_(type),
is_requesting_host_permissions_(false),
is_showing_details_for_retained_files_(false),
is_showing_details_for_retained_devices_(false),
extension_(nullptr),
average_rating_(0.0),
rating_count_(0),
......@@ -108,23 +100,6 @@ void ExtensionInstallPrompt::Prompt::AddPermissionMessages(
prompt_permissions_.AddPermissionMessages(permissions);
}
void ExtensionInstallPrompt::Prompt::SetIsShowingDetails(
DetailsType type,
size_t index,
bool is_showing_details) {
switch (type) {
case PERMISSIONS_DETAILS:
prompt_permissions_.is_showing_details[index] = is_showing_details;
break;
case RETAINED_FILES_DETAILS:
is_showing_details_for_retained_files_ = is_showing_details;
break;
case RETAINED_DEVICES_DETAILS:
is_showing_details_for_retained_devices_ = is_showing_details;
break;
}
}
void ExtensionInstallPrompt::Prompt::SetWebstoreData(
const std::string& localized_user_count,
bool show_user_count,
......@@ -395,10 +370,6 @@ size_t ExtensionInstallPrompt::Prompt::GetPermissionCount() const {
return prompt_permissions_.permissions.size();
}
size_t ExtensionInstallPrompt::Prompt::GetPermissionsDetailsCount() const {
return prompt_permissions_.details.size();
}
base::string16 ExtensionInstallPrompt::Prompt::GetPermission(
size_t index) const {
CHECK_LT(index, prompt_permissions_.permissions.size());
......@@ -411,20 +382,6 @@ base::string16 ExtensionInstallPrompt::Prompt::GetPermissionsDetails(
return prompt_permissions_.details[index];
}
bool ExtensionInstallPrompt::Prompt::GetIsShowingDetails(
DetailsType type, size_t index) const {
switch (type) {
case PERMISSIONS_DETAILS:
CHECK_LT(index, prompt_permissions_.is_showing_details.size());
return prompt_permissions_.is_showing_details[index];
case RETAINED_FILES_DETAILS:
return is_showing_details_for_retained_files_;
case RETAINED_DEVICES_DETAILS:
return is_showing_details_for_retained_devices_;
}
return false;
}
size_t ExtensionInstallPrompt::Prompt::GetRetainedFileCount() const {
return retained_files_.size();
}
......@@ -449,10 +406,6 @@ bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeButton() const {
return !retained_files_.empty() || !retained_device_messages_.empty();
}
bool ExtensionInstallPrompt::Prompt::ShouldDisplayRevokeFilesButton() const {
return !retained_files_.empty();
}
bool ExtensionInstallPrompt::Prompt::ShouldDisplayWithholdingUI() const {
return base::FeatureList::IsEnabled(
extensions_features::
......
......@@ -18,7 +18,6 @@
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
#include "base/threading/thread_checker.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/install_prompt_permissions.h"
#include "extensions/common/permissions/permission_message.h"
#include "third_party/skia/include/core/SkBitmap.h"
......@@ -79,13 +78,6 @@ class ExtensionInstallPrompt {
// The last prompt type to display; only used for testing.
static PromptType g_last_prompt_type_for_tests;
// Enumeration for permissions and retained files details.
enum DetailsType {
PERMISSIONS_DETAILS = 0,
RETAINED_FILES_DETAILS,
RETAINED_DEVICES_DETAILS,
};
// 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
......@@ -98,9 +90,6 @@ class ExtensionInstallPrompt {
void AddPermissionSet(const extensions::PermissionSet& permissions);
void AddPermissionMessages(
const extensions::PermissionMessages& permissions);
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,
......@@ -133,10 +122,8 @@ class ExtensionInstallPrompt {
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;
bool GetIsShowingDetails(DetailsType type, size_t index) const;
size_t GetRetainedFileCount() const;
base::string16 GetRetainedFile(size_t index) const;
size_t GetRetainedDeviceCount() const;
......@@ -172,12 +159,8 @@ class ExtensionInstallPrompt {
bool has_webstore_data() const { return has_webstore_data_; }
private:
friend class base::RefCountedThreadSafe<Prompt>;
bool ShouldDisplayRevokeButton() const;
bool ShouldDisplayRevokeFilesButton() const;
const PromptType type_;
// Permissions that are being requested (may not be all of an extension's
......@@ -186,9 +169,6 @@ class ExtensionInstallPrompt {
bool is_requesting_host_permissions_;
bool is_showing_details_for_retained_files_;
bool is_showing_details_for_retained_devices_;
// The extension being installed.
const extensions::Extension* extension_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment