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

Unified Diff: chrome/browser/permissions/delegation_tracker.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/delegation_tracker.h
diff --git a/chrome/browser/permissions/delegation_tracker.h b/chrome/browser/permissions/delegation_tracker.h
index 0f3811dc8876a405186fa05f5a2d9339226586cf..68c1e7917a22de55dabc15455d76541d1172fff3 100644
--- a/chrome/browser/permissions/delegation_tracker.h
+++ b/chrome/browser/permissions/delegation_tracker.h
@@ -10,11 +10,11 @@
#include <vector>
#include "base/macros.h"
+#include "components/content_settings/core/common/content_settings_types.h"
namespace content {
class RenderFrameHost;
-enum class PermissionType;
} // namespace content
@@ -33,7 +33,7 @@ class DelegationTracker {
// Set the |permissions| which are delegated to |child_rfh| by its parent.
void SetDelegatedPermissions(
content::RenderFrameHost* child_rfh,
- const std::vector<content::PermissionType>& permissions);
+ const std::vector<ContentSettingsType>& permissions);
// Query whether |permission| is granted to |requesting_rfh|. This will return
// true if |requesting_rfh| is a top-level frame or if it has been delegated
@@ -42,7 +42,7 @@ class DelegationTracker {
// |permission| to it's child OR have the same origin as it's child on that
// path in order for this to return true.
bool IsGranted(content::RenderFrameHost* requesting_rfh,
- const content::PermissionType& permission);
+ ContentSettingsType permission);
private:
class DelegatedForChild;

Powered by Google App Engine
This is Rietveld 408576698