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

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

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase 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 239614362639a43dbec14e4be4c2a5fce6400df3..385977f4b91ac9fd587aea4c76a803421214a739 100644
--- a/chrome/browser/permissions/permission_blacklist_client.h
+++ b/chrome/browser/permissions/permission_blacklist_client.h
@@ -9,7 +9,6 @@
#include "base/memory/ref_counted.h"
#include "chrome/browser/permissions/permission_util.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;
@@ -36,7 +35,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,
@@ -47,7 +46,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,
@@ -70,7 +69,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_;

Powered by Google App Engine
This is Rietveld 408576698