Merge pull request #4 from brave/insecure-content

add webview settings for secure display and running of content
brave · Jan 15, 2016 · 1fee9a3 · 1fee9a3
2 parents 9dc98b1 + 3fed5e6
commit 1fee9a3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/atom/browser/lib/guest-view-manager.coffee b/atom/browser/lib/guest-view-manager.coffee
@@ -134,6 +134,8 @@ attachGuest = (embedder, elementInstanceId, guestInstanceId, params) ->
     guestInstanceId: guestInstanceId
     nodeIntegration: params.nodeintegration ? false
     plugins: params.plugins
+    allowDisplayingInsecureContent: params.allowDisplayingInsecureContent ? false
+    allowRunningInsecureContent: params.allowRunningInsecureContent ? false
     webSecurity: !params.disablewebsecurity
   webPreferences.preloadURL = params.preload if params.preload
 

diff --git a/atom/renderer/lib/web-view/web-view-attributes.coffee b/atom/renderer/lib/web-view/web-view-attributes.coffee
@@ -226,6 +226,8 @@ WebViewImpl::setupWebViewAttributes = ->
   @attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER] = new HttpReferrerAttribute(this)
   @attributes[webViewConstants.ATTRIBUTE_USERAGENT] = new UserAgentAttribute(this)
   @attributes[webViewConstants.ATTRIBUTE_NODEINTEGRATION] = new BooleanAttribute(webViewConstants.ATTRIBUTE_NODEINTEGRATION, this)
+  @attributes[webViewConstants.ATTRIBUTE_ALLOWDISPLAYINGINSECURECONTENT] = new BooleanAttribute(webViewConstants.ATTRIBUTE_ALLOWDISPLAYINGINSECURECONTENT, this)
+  @attributes[webViewConstants.ATTRIBUTE_ALLOWRUNNINGINSECURECONTENT] = new BooleanAttribute(webViewConstants.ATTRIBUTE_ALLOWRUNNINGINSECURECONTENT, this)
   @attributes[webViewConstants.ATTRIBUTE_PLUGINS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_PLUGINS, this)
   @attributes[webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY] = new BooleanAttribute(webViewConstants.ATTRIBUTE_DISABLEWEBSECURITY, this)
   @attributes[webViewConstants.ATTRIBUTE_ALLOWPOPUPS] = new BooleanAttribute(webViewConstants.ATTRIBUTE_ALLOWPOPUPS, this)

diff --git a/atom/renderer/lib/web-view/web-view-constants.coffee b/atom/renderer/lib/web-view/web-view-constants.coffee
@@ -11,6 +11,8 @@ module.exports =
   ATTRIBUTE_SRC: 'src'
   ATTRIBUTE_HTTPREFERRER: 'httpreferrer'
   ATTRIBUTE_NODEINTEGRATION: 'nodeintegration'
+  ATTRIBUTE_ALLOWDISPLAYINGINSECURECONTENT: 'allowDisplayingInsecureContent'
+  ATTRIBUTE_ALLOWRUNNINGINSECURECONTENT: 'allowRunningInsecureContent'
   ATTRIBUTE_PLUGINS: 'plugins'
   ATTRIBUTE_DISABLEWEBSECURITY: 'disablewebsecurity'
   ATTRIBUTE_ALLOWPOPUPS: 'allowpopups'