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

Unified Diff: chrome/browser/permissions/permission_context_base.cc

Issue 2391743005: Make the flash permission prompt work properly on file: URLs (Closed)
Patch Set: Created 4 years, 2 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_context_base.cc
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
index 8e0e4ee83e3697a44fe5870c92d1c88955b8ffd9..3818c8ee8ff881d127bd8de537c8b9ff7b39ce78 100644
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
@@ -292,6 +292,8 @@ void PermissionContextBase::UpdateContentSetting(
DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
content_setting == CONTENT_SETTING_BLOCK);
+ DCHECK(!requesting_origin.SchemeIsFile());
+ DCHECK(!embedding_origin.SchemeIsFile());
tommycli 2016/10/05 16:26:20 Are you sure this won't cause a crash for other da
raymes 2016/10/05 23:15:53 Not that I know of - but if they do, I'm intereste
HostContentSettingsMapFactory::GetForProfile(profile_)
->SetContentSettingDefaultScope(requesting_origin, embedding_origin,
« no previous file with comments | « no previous file | chrome/browser/permissions/permissions_browsertest.h » ('j') | chrome/test/data/permissions/flash2.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698