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

Unified Diff: chrome/browser/permissions/permission_infobar_delegate.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_infobar_delegate.h
diff --git a/chrome/browser/permissions/permission_infobar_delegate.h b/chrome/browser/permissions/permission_infobar_delegate.h
index 7b0f429de36cab6d44a3da822b1061367c7f730d..9dfbf4b00dc91e8a106ddb606c72d6446321be9e 100644
--- a/chrome/browser/permissions/permission_infobar_delegate.h
+++ b/chrome/browser/permissions/permission_infobar_delegate.h
@@ -13,7 +13,6 @@
#include "chrome/browser/permissions/permission_util.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
-#include "content/public/browser/permission_type.h"
#include "url/gurl.h"
namespace infobars {
@@ -41,14 +40,14 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
// |infobar_service| and manages its own lifetime; callers must only use it
// for calls to |infobar_service|.
static infobars::InfoBar* Create(InfoBarService* infobar_service,
- content::PermissionType type,
+ ContentSettingsType type,
const GURL& requesting_frame,
bool user_gesture,
Profile* profile,
const PermissionSetCallback& callback);
static std::unique_ptr<PermissionInfoBarDelegate> CreateDelegate(
- content::PermissionType type,
+ ContentSettingsType type,
const GURL& requesting_frame,
bool user_gesture,
Profile* profile,
@@ -77,7 +76,6 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
protected:
PermissionInfoBarDelegate(const GURL& requesting_origin,
- content::PermissionType permission_type,
ContentSettingsType content_settings_type,
bool user_gesture,
Profile* profile,
@@ -92,7 +90,6 @@ class PermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
void SetPermission(bool update_content_setting, PermissionAction decision);
GURL requesting_origin_;
- content::PermissionType permission_type_;
ContentSettingsType content_settings_type_;
Profile* const profile_;
const PermissionSetCallback callback_;
« no previous file with comments | « chrome/browser/permissions/permission_dialog_delegate.cc ('k') | chrome/browser/permissions/permission_infobar_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698