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

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

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more 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_request_impl.h
diff --git a/chrome/browser/permissions/permission_request_impl.h b/chrome/browser/permissions/permission_request_impl.h
index c4a315ba874d156d744797f2c86901e55aaf0932..ea3eec03e4491e3a4098999a58a714aefd9a5fd2 100644
--- a/chrome/browser/permissions/permission_request_impl.h
+++ b/chrome/browser/permissions/permission_request_impl.h
@@ -10,7 +10,7 @@
#include "chrome/browser/permissions/permission_request.h"
#include "chrome/browser/permissions/permission_request_id.h"
#include "components/content_settings/core/common/content_settings.h"
-#include "content/public/browser/permission_type.h"
+#include "components/content_settings/core/common/content_settings_types.h"
class GURL;
class Profile;
@@ -24,7 +24,7 @@ class PermissionRequestImpl : public PermissionRequest {
PermissionRequestImpl(
const GURL& request_origin,
- content::PermissionType permission_type,
+ ContentSettingsType content_settings_type,
Profile* profile,
bool has_gesture,
const PermissionDecidedCallback& permission_decided_callback,
@@ -49,10 +49,9 @@ class PermissionRequestImpl : public PermissionRequest {
bool ShouldShowPersistenceToggle() const override;
PermissionRequestType GetPermissionRequestType() const override;
PermissionRequestGestureType GetGestureType() const override;
- ContentSettingsType GetContentSettingsType() const override;
GURL request_origin_;
- content::PermissionType permission_type_;
+ ContentSettingsType content_settings_type_;
Profile* profile_;
bool has_gesture_;
« no previous file with comments | « chrome/browser/permissions/permission_request.h ('k') | chrome/browser/permissions/permission_request_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698