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

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

Issue 2354443002: Implement PluginsPermissionContext and hookup to flash download interception. (Closed)
Patch Set: Implement PluginsPermissionContext and hookup to flash download interception. Created 4 years, 3 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 1d8835aaaabefeb447547e5b933a07774d536c10..934aaa283a170fdf2be38e7faf0cfcf2b7bef6ca 100644
--- a/chrome/browser/plugins/flash_download_interception.cc
+++ b/chrome/browser/plugins/flash_download_interception.cc
@@ -8,15 +8,18 @@
#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/plugins/plugin_utils.h"
#include "chrome/browser/plugins/plugins_field_trial.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_features.h"
-#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/navigation_interception/intercept_navigation_throttle.h"
#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"
using content::BrowserThread;
using content::NavigationHandle;
@@ -26,11 +29,18 @@ namespace {
const char kFlashDownloadURL[] = "get.adobe.com/flash";
+void DoNothing(blink::mojom::PermissionStatus result) {}
+
bool ShouldInterceptNavigation(
content::WebContents* source,
const navigation_interception::NavigationParams& params) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- // TODO(crbug.com/626728): Implement permission prompt logic.
+ PermissionManager* manager = PermissionManager::Get(
+ Profile::FromBrowserContext(source->GetBrowserContext()));
+ manager->RequestPermission(
+ content::PermissionType::FLASH, source->GetMainFrame(),
+ source->GetLastCommittedURL(), true, base::Bind(&DoNothing));
+
return true;
}
@@ -53,16 +63,12 @@ bool FlashDownloadInterception::ShouldStopFlashDownloadAction(
return false;
}
- std::unique_ptr<base::Value> general_setting =
- host_content_settings_map->GetWebsiteSetting(
- source_url, source_url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),
- nullptr);
- ContentSetting plugin_setting =
- content_settings::ValueToContentSetting(general_setting.get());
- plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
- CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
+ ContentSetting flash_setting = PluginUtils::GetFlashPluginContentSetting(
+ host_content_settings_map, source_url, source_url);
+ flash_setting = PluginsFieldTrial::EffectiveContentSetting(
+ CONTENT_SETTINGS_TYPE_PLUGINS, flash_setting);
- return plugin_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
+ return flash_setting == CONTENT_SETTING_DETECT_IMPORTANT_CONTENT;
}
// static
« no previous file with comments | « chrome/browser/permissions/permission_uma_util.cc ('k') | chrome/browser/plugins/flash_permission_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698