Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
don't check content settings for plugins because there is no url avai…
Browse files Browse the repository at this point in the history
…lable
  • Loading branch information
bridiver committed Jun 24, 2016
1 parent c46e47f commit ee3cc4f
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions atom/renderer/content_settings_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,7 @@ bool ContentSettingsClient::allowIndexedDB(const WebString& name,
}

bool ContentSettingsClient::allowPlugins(bool enabled_per_settings) {
bool allow = enabled_per_settings;

if (content_settings_manager_->content_settings()) {
allow =
content_settings_manager_->GetSetting(
GetOriginOrURL(render_frame()->GetWebFrame()),
GURL(),
"plugins",
allow) != CONTENT_SETTING_BLOCK;
}

if (!allow)
DidBlockContentType("plugins");
return allow;
return enabled_per_settings;
}

bool ContentSettingsClient::allowScript(bool enabled_per_settings) {
Expand Down

0 comments on commit ee3cc4f

Please sign in to comment.