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

Unified Diff: chrome/browser/plugins/flash_download_interception.cc

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/plugins/flash_download_interception.cc
diff --git a/chrome/browser/plugins/flash_download_interception.cc b/chrome/browser/plugins/flash_download_interception.cc
index f46a1e06c0e14a572f3e8bf93f15d31ff2255812..fcd0d1dd21d69dd9ce636ad94450cfaf324b1e32 100644
--- a/chrome/browser/plugins/flash_download_interception.cc
+++ b/chrome/browser/plugins/flash_download_interception.cc
@@ -17,7 +17,6 @@
#include "components/navigation_interception/navigation_params.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/navigation_handle.h"
-#include "content/public/browser/permission_type.h"
#include "content/public/browser/web_contents.h"
#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
#include "third_party/re2/src/re2/re2.h"
@@ -67,7 +66,7 @@ void FlashDownloadInterception::InterceptFlashDownloadNavigation(
if (flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT) {
PermissionManager* manager = PermissionManager::Get(profile);
manager->RequestPermission(
- content::PermissionType::FLASH, web_contents->GetMainFrame(),
+ CONTENT_SETTINGS_TYPE_PLUGINS, web_contents->GetMainFrame(),
web_contents->GetLastCommittedURL(), true, base::Bind(&DoNothing));
} else if (flash_setting == CONTENT_SETTING_BLOCK) {
TabSpecificContentSettings::FromWebContents(web_contents)

Powered by Google App Engine
This is Rietveld 408576698