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

Unified Diff: chrome/browser/permissions/permission_blacklist_client.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_blacklist_client.h
diff --git a/chrome/browser/permissions/permission_blacklist_client.h b/chrome/browser/permissions/permission_blacklist_client.h
index 1d3f080627921215aa2fb06d35d844208f907915..87f7333f264bbe4843d5489c05913361678cde83 100644
--- a/chrome/browser/permissions/permission_blacklist_client.h
+++ b/chrome/browser/permissions/permission_blacklist_client.h
@@ -9,8 +9,8 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
+#include "components/content_settings/core/common/content_settings_types.h"
#include "components/safe_browsing_db/database_manager.h"
-#include "content/public/browser/permission_type.h"
#include "content/public/browser/web_contents_observer.h"
class GURL;
@@ -38,7 +38,7 @@ class PermissionBlacklistClient
// to be alive.
static void CheckSafeBrowsingBlacklist(
scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
- content::PermissionType permission_type,
+ ContentSettingsType content_settings_type,
const GURL& request_origin,
content::WebContents* web_contents,
int timeout,
@@ -49,7 +49,7 @@ class PermissionBlacklistClient
PermissionBlacklistClient(
scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager,
- content::PermissionType permission_type,
+ ContentSettingsType content_settings_type,
const GURL& request_origin,
content::WebContents* web_contents,
int timeout,
@@ -72,7 +72,7 @@ class PermissionBlacklistClient
void WebContentsDestroyed() override;
scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> db_manager_;
- content::PermissionType permission_type_;
+ ContentSettingsType content_settings_type_;
// PermissionContextBase callback to run on the UI thread.
base::Callback<void(bool)> callback_;
« no previous file with comments | « chrome/browser/permissions/delegation_tracker_unittest.cc ('k') | chrome/browser/permissions/permission_blacklist_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698