Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2623)

Unified Diff: chrome/browser/permissions/permission_context_base.h

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: ready Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/permissions/permission_context_base.h
diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h
index 5b94cccc80c2e9fff8869458eae3590544adcf6b..e964401943e851aeb1018134e00216e643e415ce 100644
--- a/chrome/browser/permissions/permission_context_base.h
+++ b/chrome/browser/permissions/permission_context_base.h
@@ -15,7 +15,6 @@
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/keyed_service/core/keyed_service.h"
-#include "content/public/browser/permission_type.h"
#if defined(OS_ANDROID)
class PermissionQueueController;
@@ -57,7 +56,6 @@ using BrowserPermissionCallback = base::Callback<void(ContentSetting)>;
class PermissionContextBase : public KeyedService {
public:
PermissionContextBase(Profile* profile,
- const content::PermissionType permission_type,
const ContentSettingsType content_settings_type);
~PermissionContextBase() override;
@@ -155,7 +153,6 @@ class PermissionContextBase : public KeyedService {
// Whether the permission should be restricted to secure origins.
virtual bool IsRestrictedToSecureOrigins() const = 0;
- content::PermissionType permission_type() const { return permission_type_; }
ContentSettingsType content_settings_type() const {
return content_settings_type_;
}
@@ -178,7 +175,6 @@ class PermissionContextBase : public KeyedService {
bool permission_blocked);
Profile* profile_;
- const content::PermissionType permission_type_;
const ContentSettingsType content_settings_type_;
#if defined(OS_ANDROID)
std::unique_ptr<PermissionQueueController> permission_queue_controller_;

Powered by Google App Engine
This is Rietveld 408576698